[ Please avoid top-posting. ] On Mon, Mar 31, 2014 at 01:10:11PM +0000, Sanders, Aaron wrote: > I don't know why diff deletes: > -#define HP_VENDOR_ID 0x03f0 > -#define HP_LD220_PRODUCT_ID 0x3524 > > and then adds them again. I didn't touch those lines. I suspect that > it is due to the comment update above them. Well, you or your editor did add that extra space at the beginning of those lines (which git-diff reports). Your original diff was correct (although not generated from the root). Simply commit it to a git tree and run git format-patch and all should be good. Johan > -----Original Message----- > From: Johan Hovold [mailto:jhovold@xxxxxxxxx] > Sent: Saturday, March 29, 2014 5:20 AM > To: Sanders, Aaron > Cc: Johan Hovold; linux-usb@xxxxxxxxxxxxxxx > Subject: Re: [PATCH] USB:pl2303: add ids for Hewlett-Packard HP POS pole displays > > On Fri, Mar 28, 2014 at 06:29:36PM +0000, Sanders, Aaron wrote: > > Add device ids to pl2303 for the Hewlett-Packard HP POS pole displays: > > LD960: 03f0:0B39 > > LCM220: 03f0:3139 > > LCM960: 03f0:3239 > > > > Signed-off-by: Aaron Sanders <Aaron.Sanders@xxxxxx> > > > > diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c > > That's better, but now the diff is messed up below. > > Also, please add a space between "USB:" and "pl2303:" in your subject. > > > index 3b5ba4f..4d70809 100644 > > --- a/drivers/usb/serial/pl2303.c > > +++ b/drivers/usb/serial/pl2303.c > > @@ -82,6 +82,9 @@ static const struct usb_device_id id_table[] = { > > { USB_DEVICE(YCCABLE_VENDOR_ID, YCCABLE_PRODUCT_ID) }, > > { USB_DEVICE(SUPERIAL_VENDOR_ID, SUPERIAL_PRODUCT_ID) }, > > { USB_DEVICE(HP_VENDOR_ID, HP_LD220_PRODUCT_ID) }, > > + { USB_DEVICE(HP_VENDOR_ID, HP_LD960_PRODUCT_ID) }, > > + { USB_DEVICE(HP_VENDOR_ID, HP_LCM220_PRODUCT_ID) }, > > + { USB_DEVICE(HP_VENDOR_ID, HP_LCM960_PRODUCT_ID) }, > > { USB_DEVICE(CRESSI_VENDOR_ID, CRESSI_EDY_PRODUCT_ID) }, > > { USB_DEVICE(ZEAGLE_VENDOR_ID, ZEAGLE_N2ITION3_PRODUCT_ID) }, > > { USB_DEVICE(SONY_VENDOR_ID, SONY_QN3USB_PRODUCT_ID) }, diff --git > > a/drivers/usb/serial/pl2303.h b/drivers/usb/serial/pl2303.h index > > c38b8c0..ec183d1 100644 > > --- a/drivers/usb/serial/pl2303.h > > +++ b/drivers/usb/serial/pl2303.h > > @@ -121,9 +121,12 @@ > > #define SUPERIAL_VENDOR_ID 0x5372 > > #define SUPERIAL_PRODUCT_ID 0x2303 > > > > -/* Hewlett-Packard LD220-HP POS Pole Display */ > > -#define HP_VENDOR_ID 0x03f0 > > -#define HP_LD220_PRODUCT_ID 0x3524 > > +//* Hewlett-Packard POS Pole Displays */ > > + #define HP_VENDOR_ID 0x03f0 > > + #define HP_LD220_PRODUCT_ID 0x3524 > > + #define HP_LD960_PRODUCT_ID 0x0B39 > > + #define HP_LCM220_PRODUCT_ID 0x3139 > > + #define HP_LCM960_PRODUCT_ID 0x3239 > > Why are you modifying existing lines? The indentation was correct (none) and now there's also a stray '/' turning that comment into a c99 one (which we do not use). > > You should run any submissions through scripts/checkpatch.pl which would at least have caught the c99-comment mistake. > > > /* Cressi Edy (diving computer) PC interface */ > > #define CRESSI_VENDOR_ID 0x04b8 > > Care to give it one more try? > > Thanks, > Johan -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
