From patchwork Wed Feb 24 08:20:11 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan Wu X-Patchwork-Id: 46114 X-Patchwork-Delegate: apw@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 511DDB7C33 for ; Wed, 24 Feb 2010 19:20:44 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1NkCTv-0001uf-42; Wed, 24 Feb 2010 08:20:31 +0000 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1NkCTt-0001uZ-EZ for kernel-team@lists.ubuntu.com; Wed, 24 Feb 2010 08:20:29 +0000 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1NkCTt-0008Ip-DB for ; Wed, 24 Feb 2010 08:20:29 +0000 Received: from [58.33.178.29] (helo=canonical.com) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.69) (envelope-from ) id 1NkCTm-0000gn-Pl for kernel-team@lists.ubuntu.com; Wed, 24 Feb 2010 08:20:29 +0000 From: Bryan Wu To: kernel-team@lists.ubuntu.com Subject: [PATCH] UBUNTU: SAUCE: IMX51: skip ATA PASS THROUGH command for USB storage disk from JMicron Date: Wed, 24 Feb 2010 16:20:11 +0800 Message-Id: <1266999611-5872-1-git-send-email-bryan.wu@canonical.com> X-Mailer: git-send-email 1.6.3.3 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com BugLink: http://bugs.launchpad.net/bugs/499881 This issue is the same as LP431963, which was fixed in commit a60f8dfc868778889c180a50a13032fa93384115. The USB storage disk from JMircon uses the same USB-TO-SATA controller as our Babbage board. But it use different USB VID and PID. Add JMircon USB VIP and PID to the checking list. Signed-off-by: Bryan Wu --- drivers/usb/storage/usb.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c index b8355ca..3836bd4 100644 --- a/drivers/usb/storage/usb.c +++ b/drivers/usb/storage/usb.c @@ -333,11 +333,15 @@ static int usb_stor_control_thread(void * __us) US_DEBUG(usb_stor_show_command(us->srb)); #ifdef CONFIG_MACH_MX51_BABBAGE if ((us->srb->cmnd[0] == 0x85) && - (le16_to_cpu(us->pusb_dev->descriptor.idVendor) + (((le16_to_cpu(us->pusb_dev->descriptor.idVendor) == 0x05e3) && (le16_to_cpu(us->pusb_dev->descriptor.idProduct) - == 0x0718)) - US_DEBUGP("Skip ATA PASS-THROUGH command\n"); + == 0x0718)) || + ((le16_to_cpu(us->pusb_dev->descriptor.idVendor) + == 0x152d) && + (le16_to_cpu(us->pusb_dev->descriptor.idProduct) + == 0x2329)))) + US_DEBUGP("Skip ATA PASS-THROUGH command\n"); else #endif us->proto_handler(us->srb, us);