From patchwork Mon Apr 8 17:06:59 2013 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: 2410451 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 749493FD1A for ; Mon, 8 Apr 2013 17:06:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762545Ab3DHRGT (ORCPT ); Mon, 8 Apr 2013 13:06:19 -0400 Received: from mail-ee0-f41.google.com ([74.125.83.41]:53966 "EHLO mail-ee0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752517Ab3DHRGS (ORCPT ); Mon, 8 Apr 2013 13:06:18 -0400 Received: by mail-ee0-f41.google.com with SMTP id c1so2530225eek.0 for ; Mon, 08 Apr 2013 10:06:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:mime-version :content-type:content-transfer-encoding; bh=KBRQ/3Rg7mh+BuLW5iBg31Rk9i3a4siW6ujZjFsBYzE=; b=W0DOlT0nsvL/TrVsrlZyTTXyW1YkZgvYfUCH4uuLt5CBxOcDcFhD0FKa3e6RXbKiik NiRvOQhl1SdMuHhqvNhbqeGAT9myFLQpZw5zmquDaAoFhrweDYnlbzGqEMPwnAknsNZZ /L83CsjRO5eCsZB50pqIdBmWykcIsNtAJJmdahGrgsBBhoTGPZV0xsw7uSb4EDS1xUnj j2i0BIXOOeHGDWfJ2nnWObPPYPVjRKu+4X0PwTcs5+flXz39ejEynXhSMyESaUpO37Ez pnpKUSKm0amdCsA+ML2MGZtN6N6972T26PzHWsfp73u2Fh0XdpmsJVVRYGJyWU23CyOo HgNA== X-Received: by 10.15.61.8 with SMTP id h8mr50401391eex.33.1365440777246; Mon, 08 Apr 2013 10:06:17 -0700 (PDT) Received: from Athlon64X2-5000.site (ip-178-200-115-129.unitymediagroup.de. [178.200.115.129]) by mx.google.com with ESMTPS id ca4sm33165584eeb.15.2013.04.08.10.06.15 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 08 Apr 2013 10:06:16 -0700 (PDT) From: =?UTF-8?q?Frank=20Sch=C3=A4fer?= To: mchehab@redhat.com Cc: linux-media@vger.kernel.org, =?UTF-8?q?Frank=20Sch=C3=A4fer?= Subject: [PATCH] em28xx: save isoc endpoint number for DVB only if endpoint has alt settings with xMaxPacketSize != 0 Date: Mon, 8 Apr 2013 19:06:59 +0200 Message-Id: <1365440819-7864-1-git-send-email-fschaefer.oss@googlemail.com> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org In addition to commit 72cc9ba3 "em28xx: ignore isoc DVB USB endpoints with wMaxPacketSize = 0 bytes for all alt settings" we should not save the endpoint number of the isoc DVB endpoint before it has been validated. While the current code works fine, dev->dvb_ep_isoc != 0 could be interpreted as indicator that the device provides DVB support. Signed-off-by: Frank Schäfer --- drivers/media/usb/em28xx/em28xx-cards.c | 2 +- 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c index 1d3866f..085b8fc 100644 --- a/drivers/media/usb/em28xx/em28xx-cards.c +++ b/drivers/media/usb/em28xx/em28xx-cards.c @@ -3217,9 +3217,9 @@ static int em28xx_usb_probe(struct usb_interface *interface, e->bEndpointAddress; } else { if (usb_endpoint_xfer_isoc(e)) { - dev->dvb_ep_isoc = e->bEndpointAddress; if (size > dev->dvb_max_pkt_size_isoc) { has_dvb = true; /* see NOTE (~) */ + dev->dvb_ep_isoc = e->bEndpointAddress; dev->dvb_max_pkt_size_isoc = size; dev->dvb_alt_isoc = i; }