From patchwork Sun Jul 24 01:17:17 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Devin Heitmueller X-Patchwork-Id: 1002662 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 p6O1ICUp031372 for ; Sun, 24 Jul 2011 01:18:13 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751461Ab1GXBRT (ORCPT ); Sat, 23 Jul 2011 21:17:19 -0400 Received: from mail-ew0-f46.google.com ([209.85.215.46]:44048 "EHLO mail-ew0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750763Ab1GXBRS (ORCPT ); Sat, 23 Jul 2011 21:17:18 -0400 Received: by ewy4 with SMTP id 4so2082260ewy.19 for ; Sat, 23 Jul 2011 18:17:17 -0700 (PDT) MIME-Version: 1.0 Received: by 10.213.101.19 with SMTP id a19mr1267287ebo.24.1311470237105; Sat, 23 Jul 2011 18:17:17 -0700 (PDT) Received: by 10.213.7.79 with HTTP; Sat, 23 Jul 2011 18:17:17 -0700 (PDT) Date: Sat, 23 Jul 2011 21:17:17 -0400 Message-ID: Subject: [PATCH] Fix regression introduced which broke the Hauppauge USBLive 2 From: Devin Heitmueller To: Linux Media Mailing List 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]); Sun, 24 Jul 2011 01:18:13 +0000 (UTC) The following patch addresses the regression introduced in the cx231xx driver which stopped the Hauppauge USBLive2 from working. Confirmed working by both myself and the user who reported the issue on the KernelLabs blog (Robert DeLuca). cx231xx: Fix regression introduced which broke the Hauppauge USBLive 2 From: Devin Heitmueller At some point during refactoring of the cx231xx driver, the USBLive 2 device became broken. This patch results in the device working again. Thanks to Robert DeLuca for sponsoring this work. Signed-off-by: Devin Heitmueller Cc: Robert DeLuca --- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/media/video/cx231xx/cx231xx-cards.c b/drivers/media/video/cx231xx/cx231xx-cards.c index 4b22afe..d02c63a 100644 --- a/drivers/media/video/cx231xx/cx231xx-cards.c +++ b/drivers/media/video/cx231xx/cx231xx-cards.c @@ -387,6 +387,7 @@ struct cx231xx_board cx231xx_boards[] = { .norm = V4L2_STD_NTSC, .no_alt_vanc = 1, .external_av = 1, + .dont_use_port_3 = 1, .input = {{ .type = CX231XX_VMUX_COMPOSITE1, .vmux = CX231XX_VIN_2_1,