USB: serial: keyspan_pda: fix Entrega company name spelling (5f9f975b) · Commits · 戴 / test

Documentation/usb/usb-serial.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -145,7 +145,7 @@ Keyspan PDA Serial Adapter
		Single port DB-9 serial adapter, pushed as a PDA adapter for iMacs (mostly
		sold in Macintosh catalogs, comes in a translucent white/green dongle).
		Fairly simple device. Firmware is homebrew.
		This driver also works for the Xircom/Entrgra single port serial adapter.
		This driver also works for the Xircom/Entrega single port serial adapter.

		Current status:
		Things that work:

drivers/usb/serial/Kconfig

+2 −2

Original line number	Diff line number	Diff line
		@@ -606,10 +606,10 @@ config USB_SERIAL_CYBERJACK
		If unsure, say N.

		config USB_SERIAL_XIRCOM
		tristate "USB Xircom / Entregra Single Port Serial Driver"
		tristate "USB Xircom / Entrega Single Port Serial Driver"
		select USB_EZUSB_FX2
		help
		Say Y here if you want to use a Xircom or Entregra single port USB to
		Say Y here if you want to use a Xircom or Entrega single port USB to
		serial converter device. This driver makes use of firmware
		developed from scratch by Brian Warner.

drivers/usb/serial/keyspan_pda.c

+8 −8

Original line number	Diff line number	Diff line
		/*
		* USB Keyspan PDA / Xircom / Entregra Converter driver
		* USB Keyspan PDA / Xircom / Entrega Converter driver
		*
		* Copyright (C) 1999 - 2001 Greg Kroah-Hartman <greg@kroah.com>
		* Copyright (C) 1999, 2000 Brian Warner <warner@lothar.com>
		@@ -58,11 +58,11 @@ struct keyspan_pda_private {
		#define KEYSPAN_PDA_FAKE_ID 0x0103
		#define KEYSPAN_PDA_ID 0x0104 /* no clue */

		/* For Xircom PGSDB9 and older Entregra version of the same device */
		/* For Xircom PGSDB9 and older Entrega version of the same device */
		#define XIRCOM_VENDOR_ID 0x085a
		#define XIRCOM_FAKE_ID 0x8027
		#define ENTREGRA_VENDOR_ID 0x1645
		#define ENTREGRA_FAKE_ID 0x8093
		#define ENTREGA_VENDOR_ID 0x1645
		#define ENTREGA_FAKE_ID 0x8093

		static const struct usb_device_id id_table_combined[] = {
		#ifdef KEYSPAN
		@@ -70,7 +70,7 @@ static const struct usb_device_id id_table_combined[] = {
		#endif
		#ifdef XIRCOM
		{ USB_DEVICE(XIRCOM_VENDOR_ID, XIRCOM_FAKE_ID) },
		{ USB_DEVICE(ENTREGRA_VENDOR_ID, ENTREGRA_FAKE_ID) },
		{ USB_DEVICE(ENTREGA_VENDOR_ID, ENTREGA_FAKE_ID) },
		#endif
		{ USB_DEVICE(KEYSPAN_VENDOR_ID, KEYSPAN_PDA_ID) },
		{ } /* Terminating entry */
		@@ -93,7 +93,7 @@ static const struct usb_device_id id_table_fake[] = {
		#ifdef XIRCOM
		static const struct usb_device_id id_table_fake_xircom[] = {
		{ USB_DEVICE(XIRCOM_VENDOR_ID, XIRCOM_FAKE_ID) },
		{ USB_DEVICE(ENTREGRA_VENDOR_ID, ENTREGRA_FAKE_ID) },
		{ USB_DEVICE(ENTREGA_VENDOR_ID, ENTREGA_FAKE_ID) },
		{ }
		};
		#endif
		@@ -667,7 +667,7 @@ static int keyspan_pda_fake_startup(struct usb_serial *serial)
		#endif
		#ifdef XIRCOM
		else if ((le16_to_cpu(serial->dev->descriptor.idVendor) == XIRCOM_VENDOR_ID) \|\|
		(le16_to_cpu(serial->dev->descriptor.idVendor) == ENTREGRA_VENDOR_ID))
		(le16_to_cpu(serial->dev->descriptor.idVendor) == ENTREGA_VENDOR_ID))
		fw_name = "keyspan_pda/xircom_pgs.fw";
		#endif
		else {
		@@ -744,7 +744,7 @@ static struct usb_serial_driver xircom_pgs_fake_device = {
		.owner = THIS_MODULE,
		.name = "xircom_no_firm",
		},
		.description = "Xircom / Entregra PGS - (prerenumeration)",
		.description = "Xircom / Entrega PGS - (prerenumeration)",
		.id_table = id_table_fake_xircom,
		.num_ports = 1,
		.attach = keyspan_pda_fake_startup,

Admin message