diff options
author | Jiri Slaby <jslaby@suse.cz> | 2010-11-22 11:39:30 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-11-22 11:39:30 -0800 |
commit | f17bfe79e6aa34aecbd579258a5c55a790807aca (patch) | |
tree | e25465febd94697cd720f4c63b529e3ca8d5c753 | |
parent | f2ba70a22c31a179226fa0517729104497a7853f (diff) | |
download | linux-stable-f17bfe79e6aa34aecbd579258a5c55a790807aca.tar.gz linux-stable-f17bfe79e6aa34aecbd579258a5c55a790807aca.tar.bz2 linux-stable-f17bfe79e6aa34aecbd579258a5c55a790807aca.zip |
IDE: ide-floppy, remove unnecessary NULL check
Stanse found that rq in ide_floppy_callback cannot be NULL, because it
is dereferenced all around. So remove the superfluous check.
This appeared after blk_* macros removal.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/ide/ide-floppy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c index 5406b6ea3ad1..536ff68062ab 100644 --- 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) { |