mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Jeff Garzik <jgarzik@pobox.com>
To: Andrew Morton <akpm@osdl.org>, Linus Torvalds <torvalds@osdl.org>
Cc: linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [git patch] libata fix
Date: Sat, 24 Dec 2005 10:13:57 -0500	[thread overview]
Message-ID: <20051224151357.GA16841@havoc.gtf.org> (raw)


Please pull from 'upstream-fixes' branch of
master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git

to receive the following updates:

 drivers/scsi/libata-scsi.c |    5 +----
 1 files changed, 1 insertion(+), 4 deletions(-)

Tony Battersby:
      fix libata inquiry VPD for ATAPI devices

diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c
index 72ddba9..2282c04 100644
--- a/drivers/scsi/libata-scsi.c
+++ b/drivers/scsi/libata-scsi.c
@@ -2044,7 +2044,7 @@ static int atapi_qc_complete(struct ata_
 	else {
 		u8 *scsicmd = cmd->cmnd;
 
-		if (scsicmd[0] == INQUIRY) {
+		if ((scsicmd[0] == INQUIRY) && ((scsicmd[1] & 0x03) == 0)) {
 			u8 *buf = NULL;
 			unsigned int buflen;
 
@@ -2058,9 +2058,6 @@ static int atapi_qc_complete(struct ata_
 	 * device.  2) Ensure response data format / ATAPI information
 	 * are always correct.
 	 */
-	/* FIXME: do we ever override EVPD pages and the like, with
-	 * this code?
-	 */
 			if (buf[2] == 0) {
 				buf[2] = 0x5;
 				buf[3] = 0x32;

             reply	other threads:[~2005-12-24 15:14 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-12-24 15:13 Jeff Garzik [this message]
  -- strict thread matches above, loose matches on Subject: below --
2011-06-10  1:59 Jeff Garzik
2011-05-14 18:55 Jeff Garzik
2010-11-19 19:19 Jeff Garzik
2010-09-28 19:16 Jeff Garzik
2010-03-29 20:22 Jeff Garzik
2010-01-21  4:29 Jeff Garzik
2009-12-07 16:51 Jeff Garzik
2009-11-20 11:44 Jeff Garzik
2008-11-14 23:56 Jeff Garzik
2008-11-15 20:30 ` Alan Cox
2008-05-09 20:59 Jeff Garzik
2007-10-02 17:17 Jeff Garzik
2007-06-04 20:54 Jeff Garzik
2006-09-25 19:35 Jeff Garzik
2006-09-25 20:27 ` Alan Cox
2006-09-25 20:29 ` Jeff Garzik
2006-09-25 20:30 ` Alan Cox
2006-09-25 20:08   ` Jeff Garzik
2006-06-12 14:26 Jeff Garzik
2006-04-12 22:15 Jeff Garzik
2006-03-13  0:29 Jeff Garzik
2005-09-16 10:03 Jeff Garzik
2005-07-31 23:29 Jeff Garzik

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=20051224151357.GA16841@havoc.gtf.org \
    --to=jgarzik@pobox.com \
    --cc=akpm@osdl.org \
    --cc=linux-ide@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@osdl.org \
    /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

Powered by JetHome