]> git.baikalelectronics.ru Git - kernel.git/commitdiff
sound: hiface: move to use usb_control_msg_send()
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 14 Sep 2020 15:37:54 +0000 (17:37 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 16 Sep 2020 09:02:56 +0000 (11:02 +0200)
The usb_control_msg_send() call can return an error if a "short" write
happens, so move the driver over to using that call instead.

Cc: Jaroslav Kysela <perex@perex.cz>
Reviewed-by: Takashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/r/20200914153756.3412156-10-gregkh@linuxfoundation.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
sound/usb/hiface/pcm.c

index a148caa5f48e3c3f165b4790790ef3db88c27d39..f9c924e3964e6f1a9739b92b083107b17fff8380 100644 (file)
@@ -156,16 +156,14 @@ 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(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) {
+       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)
                dev_err(&device->dev, "Error setting samplerate %d.\n", rate);
-               return ret;
-       }
 
-       return 0;
+       return ret;
 }
 
 static struct pcm_substream *hiface_pcm_get_substream(struct snd_pcm_substream