lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  linux-cve-announce  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date:	Fri,  9 Jan 2015 23:36:01 -0600
From:	Chris Rorvick <chris@...vick.com>
To:	Greg Kroah-Hartman <gregkh@...uxfoundation.org>
Cc:	Chris Rorvick <chris@...vick.com>,
	Alexey Khoroshilov <khoroshilov@...ras.ru>,
	Davide Berardi <berardi.dav@...il.com>,
	devel@...verdev.osuosl.org,
	Fabian Mewes <architekt@...ing4coffee.org>,
	Gulsah Kose <gulsah.1004@...il.com>,
	Himangi Saraogi <himangi774@...il.com>,
	Jerry Snitselaar <dev@...tselaar.org>,
	L. Alberto Giménez <agimenez@...valve.es>,
	linux-kernel@...r.kernel.org, Mikhail Boiko <mm.boiko@...dex.ru>,
	Monam Agarwal <monamagarwal123@...il.com>,
	Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@...el.com>,
	Stefan Hajnoczi <stefanha@...il.com>,
	Takashi Iwai <tiwai@...e.de>
Subject: [PATCH 15/25] 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@...vick.com>
---
 drivers/staging/line6/driver.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/line6/driver.c b/drivers/staging/line6/driver.c
index e97e2cb..8b03bc0 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:
-- 
2.1.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ