GIT: unionfs2-2.6.27.y: ARCNET: Limit com20020 PCI ID matches for SOHARD cards

[Erez Zadok]

commit 88102a584bf833892493a514430bcebd53d8f017
Author: Andreas Bombe <aeb at debian.org>
Date:   Mon May 17 23:12:46 2010 -0700

    ARCNET: Limit com20020 PCI ID matches for SOHARD cards
    
    commit e7971c80a8e0299f91272ad8e8ac4167623e1862 upstream.
    
    The SH SOHARD ARCNET cards are implemented using generic PLX Technology
    PCI<->IOBus bridges. Subvendor and subdevice IDs were not specified,
    causing the driver to attach to any such bridge and likely crash the
    system by attempting to initialize an unrelated device.
    
    Fix by specifying subvendor and subdevice according to the values found
    in the PCI-ID Repository at http://pci-ids.ucw.cz/ .
    
    Signed-off-by: Andreas Bombe <aeb at debian.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

diff --git a/drivers/net/arcnet/com20020-pci.c b/drivers/net/arcnet/com20020-pci.c
index b8c0fa6..0477bd1 100644
--- a/drivers/net/arcnet/com20020-pci.c
+++ b/drivers/net/arcnet/com20020-pci.c
@@ -162,8 +162,8 @@ static struct pci_device_id com20020pci_id_table[] = {
 	{ 0x1571, 0xa204, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT },
 	{ 0x1571, 0xa205, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT },
 	{ 0x1571, 0xa206, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT },
-	{ 0x10B5, 0x9030, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT },
-	{ 0x10B5, 0x9050, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT },
+	{ 0x10B5, 0x9030, 0x10B5,     0x2978,     0, 0, ARC_CAN_10MBIT },
+	{ 0x10B5, 0x9050, 0x10B5,     0x2273,     0, 0, ARC_CAN_10MBIT },
 	{ 0x14BA, 0x6000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT },
 	{ 0x10B5, 0x2200, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT },
 	{0,}