linux-ide.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Borislav Petkov <petkovbb@googlemail.com>
To: bzolnier@gmail.com
Cc: linux-kernel@vger.kernel.org, linux-ide@vger.kernel.org,
	Borislav Petkov <petkovbb@gmail.com>
Subject: [PATCH 7/8] ide-atapi: put the rest of non-ide-cd code into the else-clause of ide_transfer_pc
Date: Thu, 18 Dec 2008 08:40:51 +0100	[thread overview]
Message-ID: <1229586052-3542-8-git-send-email-petkovbb@gmail.com> (raw)
In-Reply-To: <1229586052-3542-1-git-send-email-petkovbb@gmail.com>

There should be no functionality change resulting from this patch.

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

diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c
index dbed09c..f3dea66 100644
--- a/drivers/ide/ide-atapi.c
+++ b/drivers/ide/ide-atapi.c
@@ -534,17 +534,17 @@ static ide_startstop_t ide_transfer_pc(ide_drive_t *drive)
 							       : WAIT_TAPE_CMD;
 			expiry = NULL;
 		}
-	}
 
-	ireason = ide_read_ireason(drive);
-	if (drive->media == ide_tape)
-		ireason = ide_wait_ireason(drive, ireason);
+		ireason = ide_read_ireason(drive);
+		if (drive->media == ide_tape)
+			ireason = ide_wait_ireason(drive, ireason);
 
-	if ((ireason & ATAPI_COD) == 0 || (ireason & ATAPI_IO)) {
-		printk(KERN_ERR "%s: (IO,CoD) != (0,1) while issuing "
-				"a packet command\n", drive->name);
+		if ((ireason & ATAPI_COD) == 0 || (ireason & ATAPI_IO)) {
+			printk(KERN_ERR "%s: (IO,CoD) != (0,1) while issuing "
+					"a packet command\n", drive->name);
 
-		return ide_do_reset(drive);
+			return ide_do_reset(drive);
+		}
 	}
 
 	/* Set the interrupt routine */
-- 
1.6.0.4


  parent reply	other threads:[~2008-12-18  7:41 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-12-18  7:40 [PATCH 0/8] ide-cd: first conversion batch Borislav Petkov
2008-12-18  7:40 ` [PATCH 1/8] ide-atapi: compute cmd_len based on device type in ide_transfer_pc Borislav Petkov
2008-12-18  7:40 ` [PATCH 2/8] ide-atapi: assign expiry and timeout based on device type Borislav Petkov
2008-12-21 19:06   ` Bartlomiej Zolnierkiewicz
2008-12-18  7:40 ` [PATCH 3/8] ide-atapi: split drive-specific functionality in ide_issue_pc Borislav Petkov
2008-12-18  7:40 ` [PATCH 4/8] ide-cd: remove xferlen arg to cdrom_start_packet_command Borislav Petkov
2008-12-18  7:40 ` [PATCH 5/8] ide-cd: remove handler wrappers Borislav Petkov
2008-12-21 19:15   ` Bartlomiej Zolnierkiewicz
2008-12-18  7:40 ` [PATCH 6/8] ide-atapi: remove timeout arg to ide_issue_pc Borislav Petkov
2008-12-18  7:40 ` Borislav Petkov [this message]
2008-12-18  7:40 ` [PATCH 8/8] ide-atapi: start dma in a drive-specific way Borislav Petkov
2008-12-19 20:15 ` [PATCH 0/8] ide-cd: first conversion batch Bartlomiej Zolnierkiewicz
2008-12-19 21:19   ` Borislav Petkov
2008-12-20  6:28   ` Borislav Petkov
2008-12-21 19:05     ` Bartlomiej Zolnierkiewicz
2008-12-26 13:45       ` Borislav Petkov
2008-12-29 18:57         ` Bartlomiej Zolnierkiewicz
2008-12-26 13:46       ` Borislav Petkov
2008-12-26 13:46       ` Borislav Petkov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1229586052-3542-8-git-send-email-petkovbb@gmail.com \
    --to=petkovbb@googlemail.com \
    --cc=bzolnier@gmail.com \
    --cc=linux-ide@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=petkovbb@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).