From: Borislav Petkov <petkovbb@googlemail.com>
Date: Wed, 16 Jul 2008 18:33:45 +0000 (+0200)
Subject: ide-cd: ide_do_rw_cdrom: add the catch-all bad request case to the if-else block
X-Git-Tag: v2.6.27-rc1~1049^2~19
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=ab9d6e3374d938cf3d941fbed5ba32a19ad263b8;p=linux-2.6-omap-h63xx.git

ide-cd: ide_do_rw_cdrom: add the catch-all bad request case to the if-else block

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>
---

diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 789b19cf5e5..6ade498cd2f 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -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;
 }