Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / ide / ide-floppy.c

diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index 5a702d02c848a172dc031a2ac53adca6882b6510..61fdf544fbd63193926010ff33fef34f9d30dbe9 100644 (file)
--- a/drivers/ide/ide-floppy.c
+++ b/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) {