[PATCH v2] serial: Fix Entrega company name spelling
Hi, Patch v2 change: Fix spelling in usb-serial.txt too. Entrega is misspelled as Entregra or Entrgra, so fix that. Signed-off-by: Mark Knibbs --- diff -uprN linux-3.17-rc7 linux-3.17-rc7.new diff -uprN linux-3.17-rc7/Documentation/usb/usb-serial.txt linux-3.17-rc7.new/Documentation/usb/usb-serial.txt --- linux-3.17-rc7/Documentation/usb/usb-serial.txt 2014-09-28 22:29:07.0 +0100 +++ linux-3.17-rc7.new/Documentation/usb/usb-serial.txt 2014-10-04 12:12:43.0 +0100 @@ -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: diff -uprN linux-3.17-rc7/drivers/usb/serial/Kconfig linux-3.17-rc7.new/drivers/usb/serial/Kconfig --- linux-3.17-rc7/drivers/usb/serial/Kconfig 2014-09-28 22:29:07.0 +0100 +++ linux-3.17-rc7.new/drivers/usb/serial/Kconfig 2014-10-04 11:36:16.0 +0100 @@ -604,10 +604,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. diff -uprN linux-3.17-rc7/drivers/usb/serial/keyspan_pda.c linux-3.17-rc7.new/drivers/usb/serial/keyspan_pda.c --- linux-3.17-rc7/drivers/usb/serial/keyspan_pda.c 2014-09-28 22:29:07.0 +0100 +++ linux-3.17-rc7.new/drivers/usb/serial/keyspan_pda.c 2014-10-04 11:43:34.0 +0100 @@ -1,5 +1,5 @@ /* - * USB Keyspan PDA / Xircom / Entregra Converter driver + * USB Keyspan PDA / Xircom / Entrega Converter driver * * Copyright (C) 1999 - 2001 Greg Kroah-Hartman * Copyright (C) 1999, 2000 Brian Warner @@ -58,11 +58,11 @@ struct keyspan_pda_private { #define KEYSPAN_PDA_FAKE_ID0x0103 #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_ID0x8093 static const struct usb_device_id id_table_combined[] = { #ifdef KEYSPAN @@ -70,7 +70,7 @@ static const struct usb_device_id id_tab #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_tab #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(stru #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_p .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, -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2] serial: Fix Entrega company name spelling
On Sat, Oct 04, 2014 at 12:19:59PM +0100, Mark Knibbs wrote: > Hi, > > Patch v2 change: Fix spelling in usb-serial.txt too. Since everything you put here ends up in the commit message body, you should keep any greetings or changelog under the cut-off line below. Fixed it up and applied to next. Thanks, Johan > Entrega is misspelled as Entregra or Entrgra, so fix that. > > Signed-off-by: Mark Knibbs > > --- > diff -uprN linux-3.17-rc7 linux-3.17-rc7.new > diff -uprN linux-3.17-rc7/Documentation/usb/usb-serial.txt > linux-3.17-rc7.new/Documentation/usb/usb-serial.txt > --- linux-3.17-rc7/Documentation/usb/usb-serial.txt 2014-09-28 > 22:29:07.0 +0100 > +++ linux-3.17-rc7.new/Documentation/usb/usb-serial.txt 2014-10-04 > 12:12:43.0 +0100 > @@ -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: > diff -uprN linux-3.17-rc7/drivers/usb/serial/Kconfig > linux-3.17-rc7.new/drivers/usb/serial/Kconfig > --- linux-3.17-rc7/drivers/usb/serial/Kconfig 2014-09-28 22:29:07.0 > +0100 > +++ linux-3.17-rc7.new/drivers/usb/serial/Kconfig 2014-10-04 > 11:36:16.0 +0100 > @@ -604,10 +604,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. > > diff -uprN linux-3.17-rc7/drivers/usb/serial/keyspan_pda.c > linux-3.17-rc7.new/drivers/usb/serial/keyspan_pda.c > --- linux-3.17-rc7/drivers/usb/serial/keyspan_pda.c 2014-09-28 > 22:29:07.0 +0100 > +++ linux-3.17-rc7.new/drivers/usb/serial/keyspan_pda.c 2014-10-04 > 11:43:34.0 +0100 > @@ -1,5 +1,5 @@ > /* > - * USB Keyspan PDA / Xircom / Entregra Converter driver > + * USB Keyspan PDA / Xircom / Entrega Converter driver > * > * Copyright (C) 1999 - 2001 Greg Kroah-Hartman > * Copyright (C) 1999, 2000 Brian Warner > @@ -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_ID0x1645 > +#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_tab > #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_tab > #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(stru > #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_p > .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 =
Re: [PATCH v2] serial: Fix Entrega company name spelling
On Sat, Oct 04, 2014 at 12:19:59PM +0100, Mark Knibbs wrote: > Hi, > > Patch v2 change: Fix spelling in usb-serial.txt too. > > Entrega is misspelled as Entregra or Entrgra, so fix that. > > Signed-off-by: Mark Knibbs I see a bunch of patches from you in my queue, but I'm confused as to which ones I should apply, and which I should ignore. Can you resend what I should apply please? Also, should I have reverted a previous patch I applied? If so, what is the git commit id of it? thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2] serial: Fix Entrega company name spelling
Hi Greg, On Mon, 3 Nov 2014 15:23:36 -0800 Greg KH wrote: > On Sat, Oct 04, 2014 at 12:19:59PM +0100, Mark Knibbs wrote: > > ... > > I see a bunch of patches from you in my queue, but I'm confused as to > which ones I should apply, and which I should ignore. > > Can you resend what I should apply please? Also, should I have reverted > a previous patch I applied? If so, what is the git commit id of it? Commit bda9893c50fb56253d3c206c14e3f933e5f68b3c "storage: Replace magic number with define in usb_stor_euscsi_init()" should be reverted. Patches which could/should be applied are: Update default usb-storage delay_use value in kernel-parameters.txt storage: Fix bus scan and multi-LUN support for SCM eUSCSI devices [v2] serial: Fix Entrega company name spelling [v2] storage: Reject bogus max LUN values [v2] storage: Fix timeout in usb_stor_euscsi_init() and usb_stor_huawei_e220_init() [v3] storage: Enable multi-target mode as vendor driver does for SCM eUSCSI bridge I'll resend all those. Mark -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2] serial: Fix Entrega company name spelling
On Tue, Nov 04, 2014 at 01:01:18PM +, Mark Knibbs wrote: > Hi Greg, > > On Mon, 3 Nov 2014 15:23:36 -0800 > Greg KH wrote: > > > On Sat, Oct 04, 2014 at 12:19:59PM +0100, Mark Knibbs wrote: > > > ... > > > > I see a bunch of patches from you in my queue, but I'm confused as to > > which ones I should apply, and which I should ignore. > > > > Can you resend what I should apply please? Also, should I have reverted > > a previous patch I applied? If so, what is the git commit id of it? > > Commit bda9893c50fb56253d3c206c14e3f933e5f68b3c "storage: Replace magic > number with define in usb_stor_euscsi_init()" should be reverted. > > Patches which could/should be applied are: > Update default usb-storage delay_use value in kernel-parameters.txt > storage: Fix bus scan and multi-LUN support for SCM eUSCSI devices > [v2] serial: Fix Entrega company name spelling > [v2] storage: Reject bogus max LUN values > [v2] storage: Fix timeout in usb_stor_euscsi_init() and > usb_stor_huawei_e220_init() > [v3] storage: Enable multi-target mode as vendor driver does for SCM eUSCSI > bridge > > I'll resend all those. Ok, I think I've gone through all of these, either appyling them, or asking for a resend. thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html