Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1763492AbZCNBea (ORCPT ); Fri, 13 Mar 2009 21:34:30 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753228AbZCNBUl (ORCPT ); Fri, 13 Mar 2009 21:20:41 -0400 Received: from kroah.org ([198.145.64.141]:35123 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753437AbZCNBUV (ORCPT ); Fri, 13 Mar 2009 21:20:21 -0400 X-Mailbox-Line: From gregkh@mini.kroah.org Fri Mar 13 18:10:37 2009 Message-Id: <20090314011037.141690419@mini.kroah.org> User-Agent: quilt/0.48-1 Date: Fri, 13 Mar 2009 18:10:16 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , Chuck Ebbert , Domenico Andreoli , Willy Tarreau , Rodrigo Rubira Branco , Jake Edge , Eugene Teo , torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Anssi Hannula , Takashi Iwai Subject: [patch 039/114] ALSA: aw2: do not grab every saa7146 based device References: <20090314010937.416083662@mini.kroah.org> Content-Disposition: inline; filename=alsa-aw2-do-not-grab-every-saa7146-based-device.patch In-Reply-To: <20090314011649.GA26170@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1434 Lines: 34 2.6.28-stable review patch. If anyone has any objections, please let us know. ------------------ From: Anssi Hannula commit e8bf069c419c1dc0657e02636441fe1179a9db14 upstream. Audiowerk2 driver snd-aw2 is bound to any saa7146 device as it does not check subsystem ids. Many DVB devices are saa7146 based, so aw2 driver grabs them as well. According to http://lkml.org/lkml/2008/10/15/311 aw2 devices have the subsystem ids set to 0, the saa7146 default. Fix conflicts with DVB devices by checking for subsystem ids = 0 specifically. Signed-off-by: Anssi Hannula Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/pci/aw2/aw2-alsa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/sound/pci/aw2/aw2-alsa.c +++ b/sound/pci/aw2/aw2-alsa.c @@ -165,7 +165,7 @@ module_param_array(enable, bool, NULL, 0 MODULE_PARM_DESC(enable, "Enable Audiowerk2 soundcard."); static struct pci_device_id snd_aw2_ids[] = { - {PCI_VENDOR_ID_SAA7146, PCI_DEVICE_ID_SAA7146, PCI_ANY_ID, PCI_ANY_ID, + {PCI_VENDOR_ID_SAA7146, PCI_DEVICE_ID_SAA7146, 0, 0, 0, 0, 0}, {0} }; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/