From patchwork Tue Dec 6 13:05:03 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 8727 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1RXuhs-0003UO-Bs; Tue, 06 Dec 2011 14:05:12 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-4) with esmtp id 1RXuhr-0002qw-Bb; Tue, 06 Dec 2011 14:05:12 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753556Ab1LFNFI (ORCPT + 4 others); Tue, 6 Dec 2011 08:05:08 -0500 Received: from moutng.kundenserver.de ([212.227.17.9]:53126 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751903Ab1LFNFH (ORCPT ); Tue, 6 Dec 2011 08:05:07 -0500 Received: from benhur.adnet.avionic-design.de (p548E075F.dip0.t-ipconnect.de [84.142.7.95]) by mrelayeu.kundenserver.de (node=mreu2) with ESMTP (Nemesis) id 0LnG25-1QrQMB1Wk1-00gz4F; Tue, 06 Dec 2011 14:05:06 +0100 Received: from mailbox.adnet.avionic-design.de (add-virt-zarafa.adnet.avionic-design.de [172.20.129.9]) by benhur.adnet.avionic-design.de (Postfix) with ESMTP id ECD232C4118; Tue, 6 Dec 2011 14:05:07 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mailbox.adnet.avionic-design.de (Postfix) with ESMTP id A5FEA2A28193; Tue, 6 Dec 2011 14:05:05 +0100 (CET) X-Virus-Scanned: amavisd-new at avionic-design.de Received: from mailbox.adnet.avionic-design.de ([127.0.0.1]) by localhost (mailbox.avionic-design.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4Lua6-uQ-q-N; Tue, 6 Dec 2011 14:05:04 +0100 (CET) Received: from localhost (avionic-0098.adnet.avionic-design.de [172.20.31.233]) (Authenticated sender: thierry.reding) by mailbox.adnet.avionic-design.de (Postfix) with ESMTPA id 7F25A2A28159; Tue, 6 Dec 2011 14:05:04 +0100 (CET) From: Thierry Reding To: Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, Stefan Ringel Subject: [PATCH] [media] tm6000: Fix fast USB access quirk Date: Tue, 6 Dec 2011 14:05:03 +0100 Message-Id: <1323176703-11305-1-git-send-email-thierry.reding@avionic-design.de> X-Mailer: git-send-email 1.7.8 In-Reply-To: <4EDE09B7.9010103@redhat.com> References: <4EDE09B7.9010103@redhat.com> X-Provags-ID: V02:K0:1dLl9gKly9F1nJI8RdLakKvWbkqja+Kjz0PCV+Cmsb5 51SHjWW1rvhmxS4eLOTU9Jb7t59hEtHoXV92fqiLndUHPeScNl 618H7C0lfpeJ0wIW3cbKfTKUZlXTQDHIZqxSBPOLNBO0KLNb2p yROUQoikWtrRoV5mdad70HuAYN0VisdgkpBDqCc67yRhO/vDhU zbkCiGLZ7GGdVXmBmbIpR9woqz63sOvSjvt8b3JCkld8gWg4xd BoIWtGO63SQQ2Wx8hS0/hIc0zAuQO7inpE6OIsPLiGru23vdey 4vwHTF68DWF96LNBbF2C6SyOxYz62VWC5NZc+iJ+FFPc2U02Mg QgkYM8vqIAKEMKLTwg/TLHMlc9zreS3Op3bTFyY1Tx8wddLUTI yWb8KD2ekXUsGrso3l8h4vxBosAmbXHTHRdkoY85PR0udpCCDT 6eo0g Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2011.12.6.124815 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1000_1099 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __URI_NO_WWW 0, __URI_NS ' X-LSpam-Score: -6.9 (------) X-LSpam-Report: No, score=-6.9 required=5.0 tests=BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5 autolearn=ham The original patch used the fast USB quirk to enable fast access to registers in the tm6000_read_write_usb(). The applied patch moved the check to the tm6000_reset(), probably due to some merge conflicts. Signed-off-by: Thierry Reding --- drivers/media/video/tm6000/tm6000-core.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/drivers/media/video/tm6000/tm6000-core.c b/drivers/media/video/tm6000/tm6000-core.c index 59dd63d..5a10bf3 100644 --- a/drivers/media/video/tm6000/tm6000-core.c +++ b/drivers/media/video/tm6000/tm6000-core.c @@ -88,7 +88,9 @@ int tm6000_read_write_usb(struct tm6000_core *dev, u8 req_type, u8 req, } kfree(data); - msleep(5); + + if ((dev->quirks & TM6000_QUIRK_NO_USB_DELAY) == 0) + msleep(5); mutex_unlock(&dev->usb_lock); return ret;