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 <[email protected]>
Cc: Takashi Iwai <[email protected]>
Cc: [email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
 sound/usb/hiface/pcm.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/sound/usb/hiface/pcm.c b/sound/usb/hiface/pcm.c
index a148caa5f48e..f9c924e3964e 100644
--- a/sound/usb/hiface/pcm.c
+++ b/sound/usb/hiface/pcm.c
@@ -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
-- 
2.28.0

Reply via email to