]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
ide-cd: ide_do_rw_cdrom: add the catch-all bad request case to the if-else block
authorBorislav Petkov <petkovbb@googlemail.com>
Wed, 16 Jul 2008 18:33:45 +0000 (20:33 +0200)
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Wed, 16 Jul 2008 18:33:45 +0000 (20:33 +0200)
There should be no functionality change resulting from this patch.

Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
drivers/ide/ide-cd.c

index 789b19cf5e5533936e13764be0592858434524d9..6ade498cd2fe691ae66c42b531cdb24791388e76 100644 (file)
@@ -1235,11 +1235,11 @@ static ide_startstop_t ide_do_rw_cdrom(ide_drive_t *drive, struct request *rq,
                /* right now this can only be a reset... */
                cdrom_end_request(drive, 1);
                return ide_stopped;
+       } else {
+               blk_dump_rq_flags(rq, "ide-cd bad flags");
+               cdrom_end_request(drive, 0);
+               return ide_stopped;
        }
-
-       blk_dump_rq_flags(rq, "ide-cd bad flags");
-       cdrom_end_request(drive, 0);
-       return ide_stopped;
 }