---

yaml --- r: 230598 b: refs/heads/master c: b9f985b h: refs/heads/master v: v3
git-mirror · Dec 17, 2010 · 1438369 · 1438369
1 parent da949a1
commit 1438369
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7278c9c19bd85cf33213a2e0b538a18d3ac8ad00
+refs/heads/master: b9f985b6e05ebd7af2aaef0eb3ae369390ef191f
diff --git a/trunk/block/genhd.c b/trunk/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;
 }