Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[firefly-linux-kernel-4.4.55.git] / block / blk-merge.c

diff --git a/block/blk-merge.c b/block/blk-merge.c
index 936a110de0b9c63ac8a3ab6d44d80d60d5533088..5f2448253797710c7d059a16ea5477e2354bcc60 100644 (file)
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -143,7 +143,7 @@ new_segment:
                         * termination bit to avoid doing a full
                         * sg_init_table() in drivers for each command.
                         */
-                       (*sg)->page_link &= ~0x02;
+                       sg_unmark_end(*sg);
                        *sg = sg_next(*sg);
                }