From mboxrd@z Thu Jan 1 00:00:00 1970 From: Johan Hovold Subject: Re: [PATCH v5 2/2] USB: serial: cp210x: Adding GE Healthcare Device ID Date: Thu, 7 Apr 2016 11:55:44 +0200 Message-ID: <20160407095544.GH25008@localhost> References: <20160407093952.GF25008@localhost> <57062C26.5080301@collabora.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mail-lf0-f66.google.com ([209.85.215.66]:33802 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755548AbcDGJzn (ORCPT ); Thu, 7 Apr 2016 05:55:43 -0400 Content-Disposition: inline In-Reply-To: <57062C26.5080301@collabora.co.uk> Sender: linux-gpio-owner@vger.kernel.org List-Id: linux-gpio@vger.kernel.org To: Martyn Welch Cc: Johan Hovold , Linus Walleij , Alexandre Courbot , Greg Kroah-Hartman , linux-usb@vger.kernel.org, linux-gpio@vger.kernel.org On Thu, Apr 07, 2016 at 10:45:10AM +0100, Martyn Welch wrote: > > > On 07/04/16 10:39, Johan Hovold wrote: > > On Tue, Mar 29, 2016 at 05:47:29PM +0100, Martyn Welch wrote: > >> The CP2105 is used in the GE Healthcare Remote Alarm Box, with the > >> Manufacturer ID of 0x1901 and Product ID of 0x0194. > >> > >> Signed-off-by: Martyn Welch > >> --- > >> drivers/usb/serial/cp210x.c | 1 + > >> 1 file changed, 1 insertion(+) > >> > >> diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c > >> index b1eb8da..5b5c4ec 100644 > >> --- a/drivers/usb/serial/cp210x.c > >> +++ b/drivers/usb/serial/cp210x.c > >> @@ -170,6 +170,7 @@ static const struct usb_device_id id_table[] = { > >> { USB_DEVICE(0x1843, 0x0200) }, /* Vaisala USB Instrument Cable */ > >> { USB_DEVICE(0x18EF, 0xE00F) }, /* ELV USB-I2C-Interface */ > >> { USB_DEVICE(0x18EF, 0xE025) }, /* ELV Marble Sound Board 1 */ > >> + { USB_DEVICE(0x1901, 0x0194) }, /* GE Healthcare Remote Alarm Box */ > >> { USB_DEVICE(0x1ADB, 0x0001) }, /* Schweitzer Engineering C662 Cable */ > >> { USB_DEVICE(0x1B1C, 0x1C00) }, /* Corsair USB Dongle */ > >> { USB_DEVICE(0x1BA4, 0x0002) }, /* Silicon Labs 358x factory default */ > > > > This one does not apply, what tree did you generate it against against? > > > > The usb-next branch of > git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git as > per your email of 31/01/16. Ah, new device ids are usually included in the current -rc kernel (rather than -next) so such patches should be generated against the usb-linus branch instead (as should any fixes). Patch now applied. Thanks, Johan