X-Git-Url: https://git.stricted.de/?a=blobdiff_plain;f=sound%2Fusb%2Fhelper.c;h=9eed8f40b179dd199702c1247dd65bdd0b56ff35;hb=8c3f5d8a9b7d0d8506bc2a0525e012eae02b1853;hp=f280c1903c25bdaa0b20e8456b6753c3dc5edcfb;hpb=eee2a817df7c5a6e569f353f8be78cc1b3604bb6;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

diff --git a/sound/usb/helper.c b/sound/usb/helper.c
index f280c1903c25..9eed8f40b179 100644
--- a/sound/usb/helper.c
+++ b/sound/usb/helper.c
@@ -81,7 +81,7 @@ void *snd_usb_find_csint_desc(void *buffer, int buflen, void *after, u8 dsubtype
  */
 int snd_usb_ctl_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
 		    __u8 requesttype, __u16 value, __u16 index, void *data,
-		    __u16 size, int timeout)
+		    __u16 size)
 {
 	int err;
 	void *buf = NULL;
@@ -92,7 +92,7 @@ int snd_usb_ctl_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
 			return -ENOMEM;
 	}
 	err = usb_control_msg(dev, pipe, request, requesttype,
-			      value, index, buf, size, timeout);
+			      value, index, buf, size, 1000);
 	if (size > 0) {
 		memcpy(data, buf, size);
 		kfree(buf);