staging: line6: Filter on Pocket POD interface
authorChris Rorvick <chris@rorvick.com>
Mon, 12 Jan 2015 20:42:50 +0000 (12:42 -0800)
committerTakashi Iwai <tiwai@suse.de>
Mon, 12 Jan 2015 21:24:05 +0000 (22:24 +0100)
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>
drivers/staging/line6/driver.c

index e97e2cb747fe0bd62da06a6c7239ccefdf0e0262..8b03bc03d4d083a9dd5aefd7f9c5219cdfe44934 100644 (file)
@@ -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: