summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorChris Rorvick <chris@rorvick.com>2015-01-12 21:42:50 +0100
committerTakashi Iwai <tiwai@suse.de>2015-01-12 22:24:05 +0100
commit3a3eae6c18e3b90311e6372a0df1371d193db2a1 (patch)
tree0f92c0e1a510b9a6fe5cd48ba74ed8dfd33e95d7 /drivers
parentstaging: line6: Split out POD HD500 interfaces (diff)
downloadlinux-3a3eae6c18e3b90311e6372a0df1371d193db2a1.tar.xz
linux-3a3eae6c18e3b90311e6372a0df1371d193db2a1.zip
staging: line6: Filter on Pocket POD interface
The driver only supports interface 1 of the Pocket POD. Use the device table to filter on this. Signed-off-by: Chris Rorvick <chris@rorvick.com> Reviewed-by: Stefan Hajnoczi <stefanha@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/line6/driver.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/staging/line6/driver.c b/drivers/staging/line6/driver.c
index e97e2cb747fe..8b03bc03d4d0 100644
--- a/drivers/staging/line6/driver.c
+++ b/drivers/staging/line6/driver.c
@@ -39,7 +39,7 @@ static const struct usb_device_id line6_id_table[] = {
{ LINE6_DEVICE(0x4642), .driver_info = LINE6_BASSPODXTLIVE },
{ LINE6_DEVICE(0x4252), .driver_info = LINE6_BASSPODXTPRO },
{ LINE6_DEVICE(0x4750), .driver_info = LINE6_GUITARPORT },
- { LINE6_DEVICE(0x5051), .driver_info = LINE6_POCKETPOD },
+ { LINE6_IF_NUM(0x5051, 1), .driver_info = LINE6_POCKETPOD },
{ LINE6_DEVICE(0x5057), .driver_info = LINE6_PODHD300 },
{ LINE6_DEVICE(0x5058), .driver_info = LINE6_PODHD400 },
{ LINE6_IF_NUM(0x414D, 0), .driver_info = LINE6_PODHD500_0 },
@@ -738,15 +738,7 @@ static int line6_probe(struct usb_interface *interface,
break;
case LINE6_POCKETPOD:
- switch (interface_number) {
- case 0:
- return -ENODEV; /* this interface has no endpoints */
- case 1:
- alternate = 0;
- break;
- default:
- MISSING_CASE;
- }
+ alternate = 0;
break;
case LINE6_PODHD500_0: