aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial
diff options
context:
space:
mode:
authorMark Knibbs <markk@clara.co.uk>2014-10-04 07:19:59 -0400
committerJohan Hovold <johan@kernel.org>2014-10-22 05:19:01 -0400
commit5f9f975b7984ffec0a25f55e58246aebf68794f4 (patch)
tree3f4dc82143364487c9e33f4d3c09a6aeb5e287cb /drivers/usb/serial
parentf114040e3ea6e07372334ade75d1ee0775c355e1 (diff)
USB: serial: keyspan_pda: fix Entrega company name spelling
Entrega is misspelled as Entregra or Entrgra, so fix that. Signed-off-by: Mark Knibbs <markk@clara.co.uk> Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'drivers/usb/serial')
-rw-r--r--drivers/usb/serial/Kconfig4
-rw-r--r--drivers/usb/serial/keyspan_pda.c16
2 files changed, 10 insertions, 10 deletions
diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index a69f7cd9d0bf..d185613bbd7d 100644
--- a/drivers/usb/serial/Kconfig
+++ b/drivers/usb/serial/Kconfig
@@ -606,10 +606,10 @@ config USB_SERIAL_CYBERJACK
606 If unsure, say N. 606 If unsure, say N.
607 607
608config USB_SERIAL_XIRCOM 608config USB_SERIAL_XIRCOM
609 tristate "USB Xircom / Entregra Single Port Serial Driver" 609 tristate "USB Xircom / Entrega Single Port Serial Driver"
610 select USB_EZUSB_FX2 610 select USB_EZUSB_FX2
611 help 611 help
612 Say Y here if you want to use a Xircom or Entregra single port USB to 612 Say Y here if you want to use a Xircom or Entrega single port USB to
613 serial converter device. This driver makes use of firmware 613 serial converter device. This driver makes use of firmware
614 developed from scratch by Brian Warner. 614 developed from scratch by Brian Warner.
615 615
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,