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: =?utf-8?q?Frank_Sch=C3=A4fer?= X-Patchwork-Id: 3469321 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 594009F39C for ; Sat, 11 Jan 2014 13:41:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 860DA2015B for ; Sat, 11 Jan 2014 13:41:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A9F382013D for ; Sat, 11 Jan 2014 13:41:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752840AbaAKNlk (ORCPT ); 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-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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);