From patchwork Sat Jan 11 13:42:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Frank Schaefer X-Patchwork-Id: 21527 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1W1yor-0004bu-JF; Sat, 11 Jan 2014 14:41:45 +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.72/mailfrontend-8) with esmtp id 1W1yop-0008Fm-kp; Sat, 11 Jan 2014 14:41:45 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752840AbaAKNlk (ORCPT + 1 other); Sat, 11 Jan 2014 08:41:40 -0500 Received: from mail-ee0-f45.google.com ([74.125.83.45]:60430 "EHLO mail-ee0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751343AbaAKNli (ORCPT ); Sat, 11 Jan 2014 08:41:38 -0500 Received: by mail-ee0-f45.google.com with SMTP id d49so2304256eek.18 for ; Sat, 11 Jan 2014 05:41:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=YWJZIEKgWDfkmGvAe5gymG9o5p+xob1JAVq3FvHRnGM=; b=KKXmlr4cC6MDa/QnPQuuhIZjJl6oX8aWvrpNO9mnFX2bbuwMGK8fyDk5aM5nDu9k21 r7ZiT+yeTcydLgB1uq6ezFux5JD9AVH+kSnNh1C81NFo+1LUMaSb0YAkMzZwe6KsVkhn UdijjuP8j+4rIljGqw6lxZ/qEHu7MzcplbzdGasZfwl1g3jO0gtENADlQJ5v+65NYW6B t2YXH2TUYqONgIZHxSp1h1TbL72SJAULOmh6PgiXVL/jOrXFGAYPXjEDNbL7kuHKc0kP pYnNcj/eFaxkevUO0rR9zTHE9R1F5I3cB0uvaPGYpWTG3tSXGeeV6iH8boMyDyb42/T4 TFeQ== X-Received: by 10.14.6.5 with SMTP id 5mr15857633eem.51.1389447697573; Sat, 11 Jan 2014 05:41:37 -0800 (PST) Received: from Athlon64X2-5000.site (ip-178-200-114-208.unitymediagroup.de. [178.200.114.208]) by mx.google.com with ESMTPSA id j46sm22911895eew.18.2014.01.11.05.41.36 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 11 Jan 2014 05:41:37 -0800 (PST) From: =?UTF-8?q?Frank=20Sch=C3=A4fer?= To: m.chehab@samsung.com Cc: linux-media@vger.kernel.org, =?UTF-8?q?Frank=20Sch=C3=A4fer?= Subject: [PATCH 2/2] em28xx: fix check for audio only usb interfaces when changing the usb alternate setting Date: Sat, 11 Jan 2014 14:42:30 +0100 Message-Id: <1389447750-2642-2-git-send-email-fschaefer.oss@googlemail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1389447750-2642-1-git-send-email-fschaefer.oss@googlemail.com> References: <1389447750-2642-1-git-send-email-fschaefer.oss@googlemail.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2014.1.11.133015 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1900_1999 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, CT_TEXT_PLAIN_UTF8_CAPS 0, DKIM_SIGNATURE 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __CT 0, __CTE 0, __CT_TEXT_PLAIN 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' Previously, we've been assuming that the video endpoints are always at usb interface 0. Hence, if vendor audio endpoints are provided at a separate interface, they were supposed to be at interface number > 0. Instead of checking for (interface number > 0) to determine if an interface is a pure audio interface, dev->is_audio_only should be checked. Signed-off-by: Frank Schäfer --- drivers/media/usb/em28xx/em28xx-audio.c | 15 +++++++++++++-- 1 Datei geändert, 13 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) diff --git a/drivers/media/usb/em28xx/em28xx-audio.c b/drivers/media/usb/em28xx/em28xx-audio.c index b2ae954..18b745f 100644 --- a/drivers/media/usb/em28xx/em28xx-audio.c +++ b/drivers/media/usb/em28xx/em28xx-audio.c @@ -243,11 +243,22 @@ static int snd_em28xx_capture_open(struct snd_pcm_substream *substream) } runtime->hw = snd_em28xx_hw_capture; - if ((dev->alt == 0 || dev->ifnum) && dev->adev.users == 0) { - if (dev->ifnum) + if (dev->adev.users == 0 && (dev->alt == 0 || dev->is_audio_only)) { + if (dev->is_audio_only) + /* vendor audio is on a separate interface */ dev->alt = 1; else + /* vendor audio is on the same interface as video */ dev->alt = 7; + /* + * FIXME: The intention seems to be to select the alt + * setting with the largest wMaxPacketSize for the video + * endpoint. + * At least dev->alt and dev->dvb_alt_isoc should be + * used instead, but we should probably not touch it at + * all if it is already >0, because wMaxPacketSize of + * the audio endpoints seems to be the same for all. + */ dprintk("changing alternate number on interface %d to %d\n", dev->ifnum, dev->alt);