From patchwork Thu Sep 1 06:43:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 1118432 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p816hI26007230 for ; Thu, 1 Sep 2011 06:43:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753632Ab1IAGnQ (ORCPT ); Thu, 1 Sep 2011 02:43:16 -0400 Received: from moutng.kundenserver.de ([212.227.126.186]:56513 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751237Ab1IAGnQ (ORCPT ); Thu, 1 Sep 2011 02:43:16 -0400 Received: from localhost (p548E0789.dip0.t-ipconnect.de [84.142.7.137]) by mrelayeu.kundenserver.de (node=mreu2) with ESMTP (Nemesis) id 0MgaRP-1QbBNO02Hn-00NULY; Thu, 01 Sep 2011 08:43:05 +0200 From: Thierry Reding To: linux-media@vger.kernel.org Cc: Mauro Carvalho Chehab Subject: [PATCH v2 2/2] [media] tm6000: Enable fast USB quirk on Cinergy Hybrid Date: Thu, 1 Sep 2011 08:43:04 +0200 Message-Id: <1314859384-31465-2-git-send-email-thierry.reding@avionic-design.de> X-Mailer: git-send-email 1.7.6.1 In-Reply-To: <1314859384-31465-1-git-send-email-thierry.reding@avionic-design.de> References: <4E5F1C87.9050207@redhat.com> <1314859384-31465-1-git-send-email-thierry.reding@avionic-design.de> X-Provags-ID: V02:K0:Zzk0KLUkvjPQX3rR088PNNkkJRueJcnPhwEu4+mY+e9 PR6PkB+k6Ba+dYI8MpgwMqTD5ZCMmcuFV+P+2WtFc0hn03I6VN EYiR3n46tM6qCS63xAdo7N0dmn81wVmlvwwtSEKaIaTTBqOPHW wQUAs4U0HVwp7BnJJokLNAVpPsO3k77KhuP2W9K4vkw6xUMAFr QWfrZBWPNE/apg0r0+d7mrkr9XMWTNXWLmhh6/TXB+OsHO51pH toTFh6ZGNZEoY5OipZxXsLb2p9c646QW1kBfjdBRMp+dUSpQoB CxyrSyZuM8FnuGkO2R7ptncPDP7e1JFSPSUdhkcTYgvoMFV+sd XmMe3hmvtgXSLOspIvgq0NiPtNDWemK8pXEptnC+/3+ktvRsNI zBc1YZnpc2UNfVnUO2pC8ljAIAL4SvUdWk= Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Thu, 01 Sep 2011 06:43:18 +0000 (UTC) The Cinergy Hybrid cards are known not to need an artificial delay after USB accesses so the quirk can safely be enabled. Signed-off-by: Thierry Reding --- drivers/staging/tm6000/tm6000-cards.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/drivers/staging/tm6000/tm6000-cards.c b/drivers/staging/tm6000/tm6000-cards.c index 5393976..aa18173 100644 --- a/drivers/staging/tm6000/tm6000-cards.c +++ b/drivers/staging/tm6000/tm6000-cards.c @@ -1002,6 +1002,16 @@ static int fill_board_specific_data(struct tm6000_core *dev) dev->vinput[2] = tm6000_boards[dev->model].vinput[2]; dev->rinput = tm6000_boards[dev->model].rinput; + /* setup per-model quirks */ + switch (dev->model) { + case TM6010_BOARD_TERRATEC_CINERGY_HYBRID_XE: + dev->quirks |= TM6000_QUIRK_NO_USB_DELAY; + break; + + default: + break; + } + /* initialize hardware */ rc = tm6000_init(dev); if (rc < 0)