From: Matthew Garrett <mjg@redhat.com>
Date: Wed, 9 Dec 2009 20:31:37 +0000 (-0800)
Subject: serial: 8250_pnp: use wildcard for serial Wacom tablets
X-Git-Tag: firefly_0821_release~11625^2~292
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=04f7ec720e5bc4413540ca5dedde8b9e5a30c401;p=firefly-linux-kernel-4.4.55.git
serial: 8250_pnp: use wildcard for serial Wacom tablets
commit 6d34855d9aa281f72c533ecb827405139d1b0fe9 upstream.
Wacom claims that the WACF namespace will always be devoted to serial
Wacom tablets. Remove the existing entries and add a wildcard to avoid
having to update the kernel every time they add a new device.
Signed-off-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Tested-by: Ping Cheng <pingc@wacom.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
diff --git a/drivers/serial/8250_pnp.c b/drivers/serial/8250_pnp.c
index 0cce8a41e696..deac67e35ce9 100644
--- a/drivers/serial/8250_pnp.c
+++ b/drivers/serial/8250_pnp.c
@@ -328,15 +328,7 @@ static const struct pnp_device_id pnp_dev_table[] = {
/* U.S. Robotics 56K Voice INT PnP*/
{ "USR9190", 0 },
/* Wacom tablets */
- { "WACF004", 0 },
- { "WACF005", 0 },
- { "WACF006", 0 },
- { "WACF007", 0 },
- { "WACF008", 0 },
- { "WACF009", 0 },
- { "WACF00A", 0 },
- { "WACF00B", 0 },
- { "WACF00C", 0 },
+ { "WACFXXX", 0 },
/* Compaq touchscreen */
{ "FPI2002", 0 },
/* Fujitsu Stylistic touchscreens */