aboutsummaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorYang Zhang <kthreadd@gmail.com>2010-12-17 08:58:36 +0100
committerJens Axboe <jaxboe@fusionio.com>2010-12-17 08:58:36 +0100
commitb9f985b6e05ebd7af2aaef0eb3ae369390ef191f (patch)
tree69aa4bd9501f988302a155ebfdc630bd2a37bfde /block
parent7278c9c19bd85cf33213a2e0b538a18d3ac8ad00 (diff)
downloadlinux-linaro-precise-b9f985b6e05ebd7af2aaef0eb3ae369390ef191f.tar.gz
block: convert !IS_ERR(p) && p to !IS_ERR_NOR_NULL(p)
Signed-off-by: Yang Zhang <kthreadd@gmail.com> Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'block')
-rw-r--r--block/genhd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/genhd.c b/block/genhd.c
index 5fa2b44a72f..79b9e327f3c 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -735,7 +735,7 @@ static void *show_partition_start(struct seq_file *seqf, loff_t *pos)
static void *p;
p = disk_seqf_start(seqf, pos);
- if (!IS_ERR(p) && p && !*pos)
+ if (!IS_ERR_OR_NULL(p) && !*pos)
seq_puts(seqf, "major minor #blocks name\n\n");
return p;
}