Revert "sound: hiface: move to use usb_control_msg_send()"
authorOliver Neukum <oneukum@suse.com>
Wed, 23 Sep 2020 13:43:37 +0000 (15:43 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 25 Sep 2020 14:33:58 +0000 (16:33 +0200)
This reverts commit 119ae38a5cdfbefdf926b34fbf65cd60dc82c95e.
The API has to be changed.

Signed-off-by: Oliver Neukum <oneukum@suse.com>
Link: https://lore.kernel.org/r/20200923134348.23862-4-oneukum@suse.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
sound/usb/hiface/pcm.c

index f9c924e..a148caa 100644 (file)
@@ -156,14 +156,16 @@ static int hiface_pcm_set_rate(struct pcm_runtime *rt, unsigned int rate)
         * This control message doesn't have any ack from the
         * other side
         */
-       ret = usb_control_msg_send(device, 0,
-                                  HIFACE_SET_RATE_REQUEST,
-                                  USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_OTHER,
-                                  rate_value, 0, NULL, 0, 100);
-       if (ret)
+       ret = usb_control_msg(device, usb_sndctrlpipe(device, 0),
+                             HIFACE_SET_RATE_REQUEST,
+                             USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_OTHER,
+                             rate_value, 0, NULL, 0, 100);
+       if (ret < 0) {
                dev_err(&device->dev, "Error setting samplerate %d.\n", rate);
+               return ret;
+       }
 
-       return ret;
+       return 0;
 }
 
 static struct pcm_substream *hiface_pcm_get_substream(struct snd_pcm_substream