[PATCH 05/18] ide-cd: ide_do_rw_cdrom: add the catch-all bad request case to the if-else block

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Borislav Petkov
Date: Wednesday, June 11, 2008 - 11:40 pm

There should be no functionality change resulting from this patch.

Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
---
 drivers/ide/ide-cd.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index e63eea2..21c4510 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -1249,11 +1249,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;
 }
 
 
-- 
1.5.5.1

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 00/18] misc generic ide stuff, Borislav Petkov, (Wed Jun 11, 11:40 pm)
[PATCH 01/18] ide-cd: remove wait-for-idle-controller bit ..., Borislav Petkov, (Wed Jun 11, 11:40 pm)
[PATCH 05/18] ide-cd: ide_do_rw_cdrom: add the catch-all b ..., Borislav Petkov, (Wed Jun 11, 11:40 pm)
[PATCH 07/18] ide-cd: mv ide_do_rw_cdrom ide_cd_do_request, Borislav Petkov, (Wed Jun 11, 11:40 pm)
[PATCH 08/18] ide-cd: simplify request issuing path, Borislav Petkov, (Wed Jun 11, 11:41 pm)
[PATCH 13/18] ide-floppy: replace pc-&gt;c with rq-&gt;cmd, Borislav Petkov, (Wed Jun 11, 11:41 pm)
[PATCH 17/18] ide-floppy: cleanup idefloppy_create_rw_cmd, Borislav Petkov, (Wed Jun 11, 11:41 pm)
[PATCH 18/18] ide: use flags in IRQ handler, Borislav Petkov, (Wed Jun 11, 11:41 pm)
Re: [PATCH 00/18] misc generic ide stuff, Bartlomiej Zolnierki ..., (Sat Jun 14, 10:29 am)
Re: [PATCH 02/18] ide-cd: remove ide_cd_drain_data and ide ..., Bartlomiej Zolnierki ..., (Sat Jun 14, 10:29 am)
Re: [PATCH 03/18] ide-cd: cdrom_decode_status: factor out ..., Bartlomiej Zolnierki ..., (Sat Jun 14, 10:29 am)
Re: [PATCH 13/18] ide-floppy: replace pc-&gt;c with rq-&gt;cmd, Bartlomiej Zolnierki ..., (Sat Jun 14, 10:40 am)
Re: [PATCH 18/18] ide: use flags in IRQ handler, Bartlomiej Zolnierki ..., (Sat Jun 14, 10:47 am)
Re: [PATCH 00/18] misc generic ide stuff, Borislav Petkov, (Sun Jun 15, 3:27 am)
Re: [PATCH 13/18] ide-floppy: replace pc-&gt;c with rq-&gt;cmd, Bartlomiej Zolnierki ..., (Sun Jun 15, 7:57 am)
Re: [PATCH 03/18] ide-cd: cdrom_decode_status: factor out ..., Borislav Petkov, (Fri Aug 15, 12:34 am)
Re: [PATCH 03/18] ide-cd: cdrom_decode_status: factor out ..., Borislav Petkov, (Fri Aug 15, 12:34 am)