Merge git://git.infradead.org/users/eparis/audit

[firefly-linux-kernel-4.4.55.git] / include / linux / blkdev.h

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 554639249fd656dbc2180a1457dc870f57c45c4e..0207a78a8d82274546cb2436c2568a53559317f9 100644 (file)
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -1553,7 +1553,7 @@ static inline int blk_rq_map_integrity_sg(struct request_queue *q,
 }
 static inline struct blk_integrity *bdev_get_integrity(struct block_device *b)
 {
-       return 0;
+       return NULL;
 }
 static inline struct blk_integrity *blk_get_integrity(struct gendisk *disk)
 {