diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-09-22 12:12:16 +0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-09-22 12:12:16 +0400 |
commit | 7639913f7298ed23a3f026ebcbb3b4e8850bcc39 (patch) | |
tree | 26f08f061535015b748a96106f4869560e3afc63 /block/bio-integrity.c | |
parent | 4e9c58cb1219bcbcf6e698ed6541b275048bfa88 (diff) | |
parent | f8fb117034847634bff8f02632151f7535981fa1 (diff) | |
download | linux-7639913f7298ed23a3f026ebcbb3b4e8850bcc39.tar.xz |
Merge branch 'topic/hda-jack-rework' into for-next
This is a merge of rework of HD-audio jack event handling code.
It extends the jack table to allow multiple callbacks.
Diffstat (limited to 'block/bio-integrity.c')
-rw-r--r-- | block/bio-integrity.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/bio-integrity.c b/block/bio-integrity.c index bc423f7b02da..f14b4abbebd8 100644 --- a/block/bio-integrity.c +++ b/block/bio-integrity.c @@ -520,7 +520,7 @@ void bio_integrity_endio(struct bio *bio, int error) */ if (error) { bio->bi_end_io = bip->bip_end_io; - bio_endio(bio, error); + bio_endio_nodec(bio, error); return; } |