From patchwork Thu Mar 24 13:18:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Erik Hansen X-Patchwork-Id: 88196 X-Patchwork-Delegate: linux@bohmer.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 77B00B6F8D for ; Fri, 25 Mar 2011 00:18:37 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 68BEA28182; Thu, 24 Mar 2011 14:18:35 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7Ot-HubH53E4; Thu, 24 Mar 2011 14:18:35 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5632E28184; Thu, 24 Mar 2011 14:18:32 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id ADF8F28184 for ; Thu, 24 Mar 2011 14:18:29 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XzkU4xtsC88d for ; Thu, 24 Mar 2011 14:18:29 +0100 (CET) Received: from WA2EHSNDR002.bigfish.com (smtp-cpk.frontbridge.com [204.231.192.41]) by theia.denx.de (Postfix) with ESMTPS id 6FE4B28182 for ; Thu, 24 Mar 2011 14:18:28 +0100 (CET) Received: from TX2EHSOBE002.bigfish.com (10.2.40.3) by WA2EHSNDR002.bigfish.com (10.2.40.22) with Microsoft SMTP Server (TLS) id 14.1.225.8; Thu, 24 Mar 2011 13:18:25 +0000 Received: from mail111-tx2-R.bigfish.com (10.9.14.244) by TX2EHSOBE002.bigfish.com (10.9.40.22) with Microsoft SMTP Server id 14.1.225.8; Thu, 24 Mar 2011 13:18:22 +0000 Received: from mail111-tx2 (localhost.localdomain [127.0.0.1]) by mail111-tx2-R.bigfish.com (Postfix) with ESMTP id 987EF58860C; Thu, 24 Mar 2011 13:18:22 +0000 (UTC) X-FB-OUTBOUND-SPAM: yes X-SpamScore: 0 X-BigFish: VS0(zzzz1202hzzz2dh87h668h41h42h65h) X-Spam-TCS-SCL: 4:0 X-Forefront-Antispam-Report: KIP:(null); UIP:(null); IPVD:NLI; H:oce-exbhcs03b.oce.net; RD:smtp02.oce.com; EFVD:NLI X-FB-DOMAIN-IP-MATCH: fail Received: from mail111-tx2 (localhost.localdomain [127.0.0.1]) by mail111-tx2 (MessageSwitch) id 1300972702500779_7112; Thu, 24 Mar 2011 13:18:22 +0000 (UTC) Received: from TX2EHSMHS007.bigfish.com (unknown [10.9.14.243]) by mail111-tx2.bigfish.com (Postfix) with ESMTP id 75AF118D0050; Thu, 24 Mar 2011 13:18:22 +0000 (UTC) Received: from oce-exbhcs03b.oce.net (193.138.13.20) by TX2EHSMHS007.bigfish.com (10.9.99.107) with Microsoft SMTP Server id 14.1.225.8; Thu, 24 Mar 2011 13:18:22 +0000 Received: from ws038732.localdomain ([134.188.204.166]) by oce-exbhcs03b.oce.net with Microsoft SMTPSVC(6.0.3790.4675); Thu, 24 Mar 2011 14:18:24 +0100 Received: by ws038732.localdomain (Postfix, from userid 1000) id DB90D2458C; Thu, 24 Mar 2011 14:18:17 +0100 (CET) From: Erik Hansen To: Date: Thu, 24 Mar 2011 14:18:12 +0100 Message-ID: <1300972692-26627-1-git-send-email-erik@makarta.com> X-Mailer: git-send-email 1.7.0.4 X-OriginalArrivalTime: 24 Mar 2011 13:18:24.0411 (UTC) FILETIME=[F45546B0:01CBEA25] MIME-Version: 1.0 X-OriginatorOrg: oce.com Cc: Erik Hansen Subject: [U-Boot] [PATCH] Remove unnecessary reset request in usb_stor_get_info X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 Precedence: list Reply-To: qeha@ws038732.localdomain List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de The reset request in usb_stor_get_info is causing issues with some usb sticks. Some of these sticks vendor_id/product_id have been hardcoded to not reset but better is to remove the reset altogether. It is not needed. --- common/usb_storage.c | 25 ------------------------- 1 files changed, 0 insertions(+), 25 deletions(-) diff --git a/common/usb_storage.c b/common/usb_storage.c index 1e6cd6a..6963e6d 100644 --- a/common/usb_storage.c +++ b/common/usb_storage.c @@ -1346,31 +1346,6 @@ int usb_stor_get_info(struct usb_device *dev, struct us_data *ss, unsigned long *capacity, *blksz; ccb *pccb = &usb_ccb; - /* for some reasons a couple of devices would not survive this reset */ - if ( - /* Sony USM256E */ - (dev->descriptor.idVendor == 0x054c && - dev->descriptor.idProduct == 0x019e) - || - /* USB007 Mini-USB2 Flash Drive */ - (dev->descriptor.idVendor == 0x066f && - dev->descriptor.idProduct == 0x2010) - || - /* SanDisk Corporation Cruzer Micro 20044318410546613953 */ - (dev->descriptor.idVendor == 0x0781 && - dev->descriptor.idProduct == 0x5151) - || - /* - * SanDisk Corporation U3 Cruzer Micro 1/4GB - * Flash Drive 000016244373FFB4 - */ - (dev->descriptor.idVendor == 0x0781 && - dev->descriptor.idProduct == 0x5406) - ) - USB_STOR_PRINTF("usb_stor_get_info: skipping RESET..\n"); - else - ss->transport_reset(ss); - pccb->pdata = usb_stor_buf; dev_desc->target = dev->devnum;