From 24462aa2e8ef23b4910874b455ae7ab83a411d2e Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jslaby@suse.cz>
Date: Mon, 22 Nov 2010 11:39:30 -0800
Subject: [PATCH] --- yaml --- r: 247919 b: refs/heads/master c:
 f17bfe79e6aa34aecbd579258a5c55a790807aca h: refs/heads/master i:   247917:
 f17c5610d0e13cbac06474468e9ce43cb9a24a76   247915:
 c7a6b6b9975c9d134db6cdcc7dbedfa8a0a8edd2   247911:
 0a204043350021d6e30205df7d4081c2e2d7b854   247903:
 dc2b66c84b5aa00dcd7298677f700e7b8e8263cf v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/ide/ide-floppy.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 944a455e485d..68565b72ee01 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2ba70a22c31a179226fa0517729104497a7853f
+refs/heads/master: f17bfe79e6aa34aecbd579258a5c55a790807aca
diff --git a/trunk/drivers/ide/ide-floppy.c b/trunk/drivers/ide/ide-floppy.c
index 5406b6ea3ad1..536ff68062ab 100644
--- a/trunk/drivers/ide/ide-floppy.c
+++ b/trunk/drivers/ide/ide-floppy.c
@@ -73,7 +73,7 @@ static int ide_floppy_callback(ide_drive_t *drive, int dsc)
 		drive->failed_pc = NULL;
 
 	if (pc->c[0] == GPCMD_READ_10 || pc->c[0] == GPCMD_WRITE_10 ||
-	    (rq && rq->cmd_type == REQ_TYPE_BLOCK_PC))
+	    rq->cmd_type == REQ_TYPE_BLOCK_PC)
 		uptodate = 1; /* FIXME */
 	else if (pc->c[0] == GPCMD_REQUEST_SENSE) {