USB: serial: ftdi_sio: update Actisense PIDs constant names

commit 513d88a88e0203188a38f4647dd08170aebd85df upstream.

Update the constant names for unused USB PIDs (product identifiers) to
reflect the new products now using the PIDs.

Signed-off-by: Mark Glover <mark.glover@actisense.com>
Cc: stable@vger.kernel.org
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 1bf2361..13a5678 100644 (file)
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -1033,9 +1033,9 @@ static const struct usb_device_id id_table_combined[] = {
        { USB_DEVICE(FTDI_VID, ACTISENSE_USG_PID) },
        { USB_DEVICE(FTDI_VID, ACTISENSE_NGT_PID) },
        { USB_DEVICE(FTDI_VID, ACTISENSE_NGW_PID) },
-       { USB_DEVICE(FTDI_VID, ACTISENSE_D9AC_PID) },
-       { USB_DEVICE(FTDI_VID, ACTISENSE_D9AD_PID) },
-       { USB_DEVICE(FTDI_VID, ACTISENSE_D9AE_PID) },
+       { USB_DEVICE(FTDI_VID, ACTISENSE_UID_PID) },
+       { USB_DEVICE(FTDI_VID, ACTISENSE_USA_PID) },
+       { USB_DEVICE(FTDI_VID, ACTISENSE_NGX_PID) },
        { USB_DEVICE(FTDI_VID, ACTISENSE_D9AF_PID) },
        { USB_DEVICE(FTDI_VID, CHETCO_SEAGAUGE_PID) },
        { USB_DEVICE(FTDI_VID, CHETCO_SEASWITCH_PID) },

diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
index e209944..21a2b5a 100644 (file)
--- a/drivers/usb/serial/ftdi_sio_ids.h
+++ b/drivers/usb/serial/ftdi_sio_ids.h
@@ -1568,9 +1568,9 @@
 #define ACTISENSE_USG_PID              0xD9A9 /* USG USB Serial Adapter */
 #define ACTISENSE_NGT_PID              0xD9AA /* NGT NMEA2000 Interface */
 #define ACTISENSE_NGW_PID              0xD9AB /* NGW NMEA2000 Gateway */
-#define ACTISENSE_D9AC_PID             0xD9AC /* Actisense Reserved */
-#define ACTISENSE_D9AD_PID             0xD9AD /* Actisense Reserved */
-#define ACTISENSE_D9AE_PID             0xD9AE /* Actisense Reserved */
+#define ACTISENSE_UID_PID              0xD9AC /* USB Isolating Device */
+#define ACTISENSE_USA_PID              0xD9AD /* USB to Serial Adapter */
+#define ACTISENSE_NGX_PID              0xD9AE /* NGX NMEA2000 Gateway */
 #define ACTISENSE_D9AF_PID             0xD9AF /* Actisense Reserved */
 #define CHETCO_SEAGAUGE_PID            0xA548 /* SeaGauge USB Adapter */
 #define CHETCO_SEASWITCH_PID           0xA549 /* SeaSwitch USB Adapter */