---

yaml --- r: 247919 b: refs/heads/master c: f17bfe7 h: refs/heads/master i: 247917: f17c561 247915: c7a6b6b 247911: 0a20404 247903: dc2b66c v: v3
git-mirror · Nov 22, 2010 · 24462aa · 24462aa
1 parent 9c58dad
commit 24462aa
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: f2ba70a22c31a179226fa0517729104497a7853f
+refs/heads/master: f17bfe79e6aa34aecbd579258a5c55a790807aca
diff --git 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) {