diff options
author | Felipe Balbi <balbi@ti.com> | 2014-09-08 14:39:01 -0500 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2014-09-08 14:39:01 -0500 |
commit | f7cc38b16e2741186253be3dff61a9d124112126 (patch) | |
tree | efce170d7c0c4baf6924275e6a42d11fa47c9290 /block/bio-integrity.c | |
parent | efb540c895d2cb77b1472edda6ca45d40719a041 (diff) | |
parent | 2ce7598c9a453e0acd0e07be7be3f5eb39608ebd (diff) | |
download | linux-f7cc38b16e2741186253be3dff61a9d124112126.tar.bz2 |
Merge tag 'v3.17-rc4' into next
Merge Linux 3.17-rc4 here so we have all the latest
fixes on next too. This also cleans up a few conflicts
when applying patches.
Signed-off-by: Felipe Balbi <balbi@ti.com>
Conflicts:
drivers/usb/gadget/Makefile
drivers/usb/gadget/function/Makefile
drivers/usb/gadget/legacy/Makefile
drivers/usb/phy/phy-samsung-usb.h
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; } |