diff --git a/[refs] b/[refs]
index a09474fa775f..f5862e96a799 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a09f4319c6d88c732ed46735f8584bbb95cac65
+refs/heads/master: 8f47428704c2fd6f787a6f340071b9c338b65803
diff --git a/trunk/drivers/block/ataflop.c b/trunk/drivers/block/ataflop.c
index f5e7180d7f47..3ff02941b3dd 100644
--- a/trunk/drivers/block/ataflop.c
+++ b/trunk/drivers/block/ataflop.c
@@ -1627,7 +1627,7 @@ static int fd_ioctl(struct block_device *bdev, fmode_t mode,
 				drive, dtp->blocks, dtp->spt, dtp->stretch);
 
 		/* sanity check */
-		if (!dtp || setprm.track != dtp->blocks/dtp->spt/2 ||
+		if (setprm.track != dtp->blocks/dtp->spt/2 ||
 		    setprm.head != 2) {
 			redo_fd_request();
 			return -EINVAL;