ARM/ARM64: tizen_bcm2711: enable CONFIG_RTL8192CU_VENDOR

[platform/kernel/linux-rpi.git] / block / blk-merge.c

diff --git a/block/blk-merge.c b/block/blk-merge.c
index bb26db9..d1435b6 100644 (file)
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -348,11 +348,13 @@ void __blk_queue_split(struct bio **bio, unsigned int *nr_segs)
                        break;
                }
                split = blk_bio_segment_split(q, *bio, &q->bio_split, nr_segs);
+               if (IS_ERR(split))
+                       *bio = split = NULL;
                break;
        }
 
        if (split) {
-               /* there isn't chance to merge the splitted bio */
+               /* there isn't chance to merge the split bio */
                split->bi_opf |= REQ_NOMERGE;
 
                bio_chain(split, *bio);