Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966510AbXHGVbf (ORCPT ); Tue, 7 Aug 2007 17:31:35 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S965273AbXHGU6i (ORCPT ); Tue, 7 Aug 2007 16:58:38 -0400 Received: from pentafluge.infradead.org ([213.146.154.40]:37683 "EHLO pentafluge.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965270AbXHGU6g (ORCPT ); Tue, 7 Aug 2007 16:58:36 -0400 Date: Tue, 7 Aug 2007 13:49:43 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org, torvalds@linux-foundation.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , Chuck Ebbert , Domenico Andreoli , akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, gmurray@webwayone.co.uk, jirislaby@gmail.com Subject: [2.6.22.2 review 83/84] sx: switch subven and subid values Message-ID: <20070807204943.GG23028@kroah.com> References: <20070807204034.882009319@mini.kroah.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline; filename="sx-switch-subven-and-subid-values.patch" In-Reply-To: <20070807204157.GA23028@kroah.com> User-Agent: Mutt/1.5.15 (2007-04-06) X-Bad-Reply: References and In-Reply-To but no 'Re:' in Subject. Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1193 Lines: 35 From: Jiri Slaby sx.c is failing to locate Graham's card. Signed-off-by: Jiri Slaby Cc: Graham Murray Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman --- drivers/char/sx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/char/sx.c +++ b/drivers/char/sx.c @@ -2721,9 +2721,9 @@ static void __devexit sx_pci_remove(stru its because the standard requires it. So check for SUBVENDOR_ID. */ static struct pci_device_id sx_pci_tbl[] = { { PCI_VENDOR_ID_SPECIALIX, PCI_DEVICE_ID_SPECIALIX_SX_XIO_IO8, - .subvendor = 0x0200,.subdevice = PCI_ANY_ID }, + .subvendor = PCI_ANY_ID, .subdevice = 0x0200 }, { PCI_VENDOR_ID_SPECIALIX, PCI_DEVICE_ID_SPECIALIX_SX_XIO_IO8, - .subvendor = 0x0300,.subdevice = PCI_ANY_ID }, + .subvendor = PCI_ANY_ID, .subdevice = 0x0300 }, { 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/