Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

[linux-2.6-microblaze.git] / sound / usb / line6 / podhd.c

diff --git a/sound/usb/line6/podhd.c b/sound/usb/line6/podhd.c
index eef45f7..28794a3 100644 (file)
--- a/sound/usb/line6/podhd.c
+++ b/sound/usb/line6/podhd.c
@@ -183,29 +183,25 @@ static const struct attribute_group podhd_dev_attr_group = {
 static int podhd_dev_start(struct usb_line6_podhd *pod)
 {
        int ret;
-       u8 *init_bytes;
+       u8 init_bytes[8];
        int i;
        struct usb_device *usbdev = pod->line6.usbdev;
 
-       init_bytes = kmalloc(8, GFP_KERNEL);
-       if (!init_bytes)
-               return -ENOMEM;
-
-       ret = usb_control_msg(usbdev, usb_sndctrlpipe(usbdev, 0),
+       ret = usb_control_msg_send(usbdev, 0,
                                        0x67, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT,
                                        0x11, 0,
-                                       NULL, 0, LINE6_TIMEOUT * HZ);
-       if (ret < 0) {
+                                       NULL, 0, LINE6_TIMEOUT * HZ, GFP_KERNEL);
+       if (ret) {
                dev_err(pod->line6.ifcdev, "read request failed (error %d)\n", ret);
                goto exit;
        }
 
        /* NOTE: looks like some kind of ping message */
-       ret = usb_control_msg(usbdev, usb_rcvctrlpipe(usbdev, 0), 0x67,
+       ret = usb_control_msg_recv(usbdev, 0, 0x67,
                                        USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_IN,
                                        0x11, 0x0,
-                                       init_bytes, 3, LINE6_TIMEOUT * HZ);
-       if (ret < 0) {
+                                       init_bytes, 3, LINE6_TIMEOUT * HZ, GFP_KERNEL);
+       if (ret) {
                dev_err(pod->line6.ifcdev,
                        "receive length failed (error %d)\n", ret);
                goto exit;
@@ -220,13 +216,12 @@ static int podhd_dev_start(struct usb_line6_podhd *pod)
                        goto exit;
        }
 
-       ret = usb_control_msg(usbdev, usb_sndctrlpipe(usbdev, 0),
+       ret = usb_control_msg_send(usbdev, 0,
                                        USB_REQ_SET_FEATURE,
                                        USB_TYPE_STANDARD | USB_RECIP_DEVICE | USB_DIR_OUT,
                                        1, 0,
-                                       NULL, 0, LINE6_TIMEOUT * HZ);
+                                       NULL, 0, LINE6_TIMEOUT * HZ, GFP_KERNEL);
 exit:
-       kfree(init_bytes);
        return ret;
 }