aboutsummaryrefslogtreecommitdiffstats
diff options
-rw-r--r--acpi-sbshc-remove-raw-pointer-from-printk-message.patch32
-rw-r--r--series2
-rw-r--r--usb-serial-pl2303-new-device-id-for-chilitag.patch37
3 files changed, 71 insertions, 0 deletions
diff --git a/acpi-sbshc-remove-raw-pointer-from-printk-message.patch b/acpi-sbshc-remove-raw-pointer-from-printk-message.patch
new file mode 100644
index 00000000000000..1180df82b82912
--- /dev/null
+++ b/acpi-sbshc-remove-raw-pointer-from-printk-message.patch
@@ -0,0 +1,32 @@
+From foo@baz Fri Jan 19 10:03:35 CET 2018
+Date: Fri, 19 Jan 2018 10:03:35 +0100
+To: Greg KH <gregkh@linuxfoundation.org>
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Subject: ACPI: sbshc: remove raw pointer from printk message
+
+There's no need to be printing a raw kernel pointer to the kernel log at
+every boot. So just remove it, and change the whole message to use the
+correct dev_info() call at the same time.
+
+
+Reported-by: Wang Qize <wang_qize@venustech.com.cn>
+Cc: stable <stable@vger.kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/acpi/sbshc.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/acpi/sbshc.c
++++ b/drivers/acpi/sbshc.c
+@@ -275,8 +275,8 @@ static int acpi_smbus_hc_add(struct acpi
+ device->driver_data = hc;
+
+ acpi_ec_add_query_handler(hc->ec, hc->query_bit, NULL, smbus_alarm, hc);
+- printk(KERN_INFO PREFIX "SBS HC: EC = 0x%p, offset = 0x%0x, query_bit = 0x%0x\n",
+- hc->ec, hc->offset, hc->query_bit);
++ dev_info(&device->dev, "SBS HC: offset = 0x%0x, query_bit = 0x%0x\n",
++ hc->offset, hc->query_bit);
+
+ return 0;
+ }
diff --git a/series b/series
index f02cc37db58a1b..017b0fe083921a 100644
--- a/series
+++ b/series
@@ -1,5 +1,7 @@
#
+usb-serial-pl2303-new-device-id-for-chilitag.patch
+acpi-sbshc-remove-raw-pointer-from-printk-message.patch
0001-Input-rmi4-remove-unneeded-MODULE_VERSION-usage.patch
0002-Input-keyboard-pmic8xxx-remove-unneeded-MODULE_VERSI.patch
0003-Input-mouse-elan_i2c-remove-unneeded-MODULE_VERSION-.patch
diff --git a/usb-serial-pl2303-new-device-id-for-chilitag.patch b/usb-serial-pl2303-new-device-id-for-chilitag.patch
new file mode 100644
index 00000000000000..890baa8cc0fcd6
--- /dev/null
+++ b/usb-serial-pl2303-new-device-id-for-chilitag.patch
@@ -0,0 +1,37 @@
+From foo@baz Thu Jan 25 09:48:55 CET 2018
+Date: Thu, 25 Jan 2018 09:48:55 +0100
+To: Greg KH <gregkh@linuxfoundation.org>
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Subject: [PATCH] USB: serial: pl2303: new device id for Chilitag
+
+This adds a new device id for Chilitag devices to the pl2303 driver.
+
+Reported-by: "Chu.Mike [朱堅宜]" <Mike-Chu@prolific.com.tw>
+Cc: stable <stable@vger.kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/usb/serial/pl2303.c | 1 +
+ drivers/usb/serial/pl2303.h | 1 +
+ 2 files changed, 2 insertions(+)
+
+--- a/drivers/usb/serial/pl2303.c
++++ b/drivers/usb/serial/pl2303.c
+@@ -38,6 +38,7 @@ static const struct usb_device_id id_tab
+ { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_RSAQ2) },
+ { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_DCU11) },
+ { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_RSAQ3) },
++ { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_CHILITAG) },
+ { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_PHAROS) },
+ { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_ALDIGA) },
+ { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_MMX) },
+--- a/drivers/usb/serial/pl2303.h
++++ b/drivers/usb/serial/pl2303.h
+@@ -12,6 +12,7 @@
+ #define PL2303_PRODUCT_ID_DCU11 0x1234
+ #define PL2303_PRODUCT_ID_PHAROS 0xaaa0
+ #define PL2303_PRODUCT_ID_RSAQ3 0xaaa2
++#define PL2303_PRODUCT_ID_CHILITAG 0xaaa8
+ #define PL2303_PRODUCT_ID_ALDIGA 0x0611
+ #define PL2303_PRODUCT_ID_MMX 0x0612
+ #define PL2303_PRODUCT_ID_GPRS 0x0609