aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/keyspan_pda.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb/serial/keyspan_pda.c')
-rw-r--r--drivers/usb/serial/keyspan_pda.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c
index 742d827f876c..dd97d8b572c3 100644
--- a/drivers/usb/serial/keyspan_pda.c
+++ b/drivers/usb/serial/keyspan_pda.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * USB Keyspan PDA / Xircom / Entregra Converter driver 2 * USB Keyspan PDA / Xircom / Entrega Converter driver
3 * 3 *
4 * Copyright (C) 1999 - 2001 Greg Kroah-Hartman <greg@kroah.com> 4 * Copyright (C) 1999 - 2001 Greg Kroah-Hartman <greg@kroah.com>
5 * Copyright (C) 1999, 2000 Brian Warner <warner@lothar.com> 5 * Copyright (C) 1999, 2000 Brian Warner <warner@lothar.com>
@@ -58,11 +58,11 @@ struct keyspan_pda_private {
58#define KEYSPAN_PDA_FAKE_ID 0x0103 58#define KEYSPAN_PDA_FAKE_ID 0x0103
59#define KEYSPAN_PDA_ID 0x0104 /* no clue */ 59#define KEYSPAN_PDA_ID 0x0104 /* no clue */
60 60
61/* For Xircom PGSDB9 and older Entregra version of the same device */ 61/* For Xircom PGSDB9 and older Entrega version of the same device */
62#define XIRCOM_VENDOR_ID 0x085a 62#define XIRCOM_VENDOR_ID 0x085a
63#define XIRCOM_FAKE_ID 0x8027 63#define XIRCOM_FAKE_ID 0x8027
64#define ENTREGRA_VENDOR_ID 0x1645 64#define ENTREGA_VENDOR_ID 0x1645
65#define ENTREGRA_FAKE_ID 0x8093 65#define ENTREGA_FAKE_ID 0x8093
66 66
67static const struct usb_device_id id_table_combined[] = { 67static const struct usb_device_id id_table_combined[] = {
68#ifdef KEYSPAN 68#ifdef KEYSPAN
@@ -70,7 +70,7 @@ static const struct usb_device_id id_table_combined[] = {
70#endif 70#endif
71#ifdef XIRCOM 71#ifdef XIRCOM
72 { USB_DEVICE(XIRCOM_VENDOR_ID, XIRCOM_FAKE_ID) }, 72 { USB_DEVICE(XIRCOM_VENDOR_ID, XIRCOM_FAKE_ID) },
73 { USB_DEVICE(ENTREGRA_VENDOR_ID, ENTREGRA_FAKE_ID) }, 73 { USB_DEVICE(ENTREGA_VENDOR_ID, ENTREGA_FAKE_ID) },
74#endif 74#endif
75 { USB_DEVICE(KEYSPAN_VENDOR_ID, KEYSPAN_PDA_ID) }, 75 { USB_DEVICE(KEYSPAN_VENDOR_ID, KEYSPAN_PDA_ID) },
76 { } /* Terminating entry */ 76 { } /* Terminating entry */
@@ -93,7 +93,7 @@ static const struct usb_device_id id_table_fake[] = {
93#ifdef XIRCOM 93#ifdef XIRCOM
94static const struct usb_device_id id_table_fake_xircom[] = { 94static const struct usb_device_id id_table_fake_xircom[] = {
95 { USB_DEVICE(XIRCOM_VENDOR_ID, XIRCOM_FAKE_ID) }, 95 { USB_DEVICE(XIRCOM_VENDOR_ID, XIRCOM_FAKE_ID) },
96 { USB_DEVICE(ENTREGRA_VENDOR_ID, ENTREGRA_FAKE_ID) }, 96 { USB_DEVICE(ENTREGA_VENDOR_ID, ENTREGA_FAKE_ID) },
97 { } 97 { }
98}; 98};
99#endif 99#endif
@@ -667,7 +667,7 @@ static int keyspan_pda_fake_startup(struct usb_serial *serial)
667#endif 667#endif
668#ifdef XIRCOM 668#ifdef XIRCOM
669 else if ((le16_to_cpu(serial->dev->descriptor.idVendor) == XIRCOM_VENDOR_ID) || 669 else if ((le16_to_cpu(serial->dev->descriptor.idVendor) == XIRCOM_VENDOR_ID) ||
670 (le16_to_cpu(serial->dev->descriptor.idVendor) == ENTREGRA_VENDOR_ID)) 670 (le16_to_cpu(serial->dev->descriptor.idVendor) == ENTREGA_VENDOR_ID))
671 fw_name = "keyspan_pda/xircom_pgs.fw"; 671 fw_name = "keyspan_pda/xircom_pgs.fw";
672#endif 672#endif
673 else { 673 else {
@@ -744,7 +744,7 @@ static struct usb_serial_driver xircom_pgs_fake_device = {
744 .owner = THIS_MODULE, 744 .owner = THIS_MODULE,
745 .name = "xircom_no_firm", 745 .name = "xircom_no_firm",
746 }, 746 },
747 .description = "Xircom / Entregra PGS - (prerenumeration)", 747 .description = "Xircom / Entrega PGS - (prerenumeration)",
748 .id_table = id_table_fake_xircom, 748 .id_table = id_table_fake_xircom,
749 .num_ports = 1, 749 .num_ports = 1,
750 .attach = keyspan_pda_fake_startup, 750 .attach = keyspan_pda_fake_startup,