From 1438369bbb8311a3e2039cfaead00b3a62e4d020 Mon Sep 17 00:00:00 2001
From: Yang Zhang <kthreadd@gmail.com>
Date: Fri, 17 Dec 2010 08:58:36 +0100
Subject: [PATCH] --- yaml --- r: 230598 b: refs/heads/master c:
 b9f985b6e05ebd7af2aaef0eb3ae369390ef191f h: refs/heads/master v: v3

---
 [refs]              | 2 +-
 trunk/block/genhd.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6be7e91d7f36..3f63cf303f38 100644
--- 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
index 5fa2b44a72ff..79b9e327f3cb 100644
--- 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;
 }