On Sun, Jan 13, 2013 at 10:40:20PM +0100, Tomasz Mloduchowski wrote:
> On 01/13/13 20:25, Greg KH wrote:
> > On Sun, Jan 13, 2013 at 07:20:27PM +0100, Tomasz Mloduchowski wrote:
> >> From: Tomasz Mloduchowski <q@xxxxxxx>
> >>
> >> Simple fix to add support for Crucible Technologies COMET Caller ID
> >> USB decoder - a device containing FTDI USB/Serial converter chip,
> >> handling 1200bps CallerID messages decoded from the phone line -
> >> adding correct USB PID is sufficient.
> >>
> >> Tested to apply cleanly and work flawlessly against 3.6.9, 3.7.0-rc8
> >> and 3.8.0-rc3 on both amd64 and x86 arches.
> >>
> >> Signed-off-by: Tomasz Mloduchowski <q@xxxxxxx>
> >> ---
> >> diff -ur linux-3.8-rc3.orig/drivers/usb/serial/ftdi_sio.c
> >> linux-3.8-rc3/drivers/usb/serial/ftdi_sio.c
> >> --- linux-3.8-rc3.orig/drivers/usb/serial/ftdi_sio.c 2013-01-13
> >> 19:41:28.000000000 +0100
> >> +++ linux-3.8-rc3/drivers/usb/serial/ftdi_sio.c 2013-01-13
> >> 19:49:27.239874311 +0100
> >> @@ -875,6 +875,8 @@
> >> { USB_DEVICE(FTDI_VID, FTDI_DISTORTEC_JTAG_LOCK_PICK_PID),
> >> .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
> >> { USB_DEVICE(FTDI_VID, FTDI_LUMEL_PD12_PID) },
> >> + /* Crucible Devices */
> >> + { USB_DEVICE(FTDI_VID, FTDI_CT_COMET_PID) },
> >> { }, /* Optional parameter entry */
> >> { } /* Terminating entry */
> >> };
> >
> > The patch is line-wrapped and all of the tabs are converted to spaces,
> > both of which are keeping this patch from being able to be applied :(
> >
> > Care to fix your email client and resend this so that I can apply it?
> >
> > thanks,
> >
> > greg k-h
> >
>
>
> No problem - this should send correctly now .
Yes it did. So can you resend it in the original format (correct
changelog entry and signed-off-by: line), so that I can apply it without
having to edit the patch by hand?
Also:
> diff -ur linux-3.8-rc3.orig/drivers/usb/serial/ftdi_sio.c linux-3.8-rc3/drivers/usb/serial/ftdi_sio.c
> --- linux-3.8-rc3.orig/drivers/usb/serial/ftdi_sio.c 2013-01-13 19:41:28.000000000 +0100
> +++ linux-3.8-rc3/drivers/usb/serial/ftdi_sio.c 2013-01-13 19:49:27.239874311 +0100
> @@ -875,6 +875,8 @@
> { USB_DEVICE(FTDI_VID, FTDI_DISTORTEC_JTAG_LOCK_PICK_PID),
> .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
> { USB_DEVICE(FTDI_VID, FTDI_LUMEL_PD12_PID) },
> + /* Crucible Devices */
> + { USB_DEVICE(FTDI_VID, FTDI_CT_COMET_PID) },
> { }, /* Optional parameter entry */
> { } /* Terminating entry */
> };
> diff -ur linux-3.8-rc3.orig/drivers/usb/serial/ftdi_sio_ids.h linux-3.8-rc3/drivers/usb/serial/ftdi_sio_ids.h
> --- linux-3.8-rc3.orig/drivers/usb/serial/ftdi_sio_ids.h 2013-01-13 19:41:28.000000000 +0100
> +++ linux-3.8-rc3/drivers/usb/serial/ftdi_sio_ids.h 2013-01-13 19:48:24.819996641 +0100
> @@ -1259,3 +1259,9 @@
> * ATI command output: Cinterion MC55i
> */
> #define FTDI_CINTERION_MC55I_PID 0xA951
> +
> +/*
> + * Product: Comet Caller ID decoder
> + * Manufacturer: Crucible Technologies
> + */
> +#define FTDI_CT_COMET_PID 0x8e08
Don't you want a tab after the FTDI_CT_COMET_PID and before the number?
thanks,
greg k-h
--
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
