From: Greg Kroah-Hartman Date: Sun, 4 May 2014 00:41:08 +0000 (-0400) Subject: 3.10-stable patches X-Git-Tag: v3.4.89~8 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e725d3a9885c835d18f498fb2b145115a8f68cc6;p=thirdparty%2Fkernel%2Fstable-queue.git 3.10-stable patches added patches: usb-pl2303-add-ids-for-hewlett-packard-hp-pos-pole-displays.patch --- diff --git a/queue-3.10/series b/queue-3.10/series index e18769902b6..4437ad0a923 100644 --- a/queue-3.10/series +++ b/queue-3.10/series @@ -85,3 +85,4 @@ ocfs2-fix-panic-on-kfree-xattr-name.patch ext4-fibmap-ioctl-causes-bug_on-due-to-handle-ext_max_blocks.patch ext4-fix-jbd2-warning-under-heavy-xattr-load.patch ext4-use-i_size_read-in-ext4_unaligned_aio.patch +usb-pl2303-add-ids-for-hewlett-packard-hp-pos-pole-displays.patch diff --git a/queue-3.10/usb-pl2303-add-ids-for-hewlett-packard-hp-pos-pole-displays.patch b/queue-3.10/usb-pl2303-add-ids-for-hewlett-packard-hp-pos-pole-displays.patch new file mode 100644 index 00000000000..11794b1f88d --- /dev/null +++ b/queue-3.10/usb-pl2303-add-ids-for-hewlett-packard-hp-pos-pole-displays.patch @@ -0,0 +1,53 @@ +From b16c02fbfb963fa2941b7517ebf1f8a21946775e Mon Sep 17 00:00:00 2001 +From: Aaron Sanders +Date: Mon, 31 Mar 2014 15:54:21 +0200 +Subject: USB: pl2303: add ids for Hewlett-Packard HP POS pole displays + +From: Aaron Sanders + +commit b16c02fbfb963fa2941b7517ebf1f8a21946775e upstream. + +Add device ids to pl2303 for the Hewlett-Packard HP POS pole displays: + +LD960: 03f0:0B39 +LCM220: 03f0:3139 +LCM960: 03f0:3239 + +[ Johan: fix indentation and sort PIDs numerically ] + +Signed-off-by: Aaron Sanders +Signed-off-by: Johan Hovold +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/serial/pl2303.c | 3 +++ + drivers/usb/serial/pl2303.h | 5 ++++- + 2 files changed, 7 insertions(+), 1 deletion(-) + +--- a/drivers/usb/serial/pl2303.c ++++ b/drivers/usb/serial/pl2303.c +@@ -82,6 +82,9 @@ static const struct usb_device_id id_tab + { 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) }, +--- a/drivers/usb/serial/pl2303.h ++++ b/drivers/usb/serial/pl2303.h +@@ -121,8 +121,11 @@ + #define SUPERIAL_VENDOR_ID 0x5372 + #define SUPERIAL_PRODUCT_ID 0x2303 + +-/* Hewlett-Packard LD220-HP POS Pole Display */ ++/* Hewlett-Packard POS Pole Displays */ + #define HP_VENDOR_ID 0x03f0 ++#define HP_LD960_PRODUCT_ID 0x0b39 ++#define HP_LCM220_PRODUCT_ID 0x3139 ++#define HP_LCM960_PRODUCT_ID 0x3239 + #define HP_LD220_PRODUCT_ID 0x3524 + + /* Cressi Edy (diving computer) PC interface */