usb: renesas_usbhs: fix signed-unsigned return

The return type of usbhsp_setup_pipecfg() was u16 but it was returning
a negative value (-EINVAL). Lets have an additional argument which will
have pipecfg and just return the status (success or error) as the return
from the function.

Signed-off-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 15 insertions, 12 deletions

diff --git a/drivers/usb/renesas_usbhs/pipe.c b/drivers/usb/renesas_usbhs/pipe.c
index 77b615ce4a25..c238772b9e9e 100644
--- a/drivers/usb/renesas_usbhs/pipe.c
+++ b/drivers/usb/renesas_usbhs/pipe.c
@@ -391,9 +391,8 @@ void usbhs_pipe_set_trans_count_if_bulk(struct usbhs_pipe *pipe, int len)
 /*
  *              pipe setup
  */
-static u16 usbhsp_setup_pipecfg(struct usbhs_pipe *pipe,
-                                int is_host,
-                                int dir_in)
+static int usbhsp_setup_pipecfg(struct usbhs_pipe *pipe, int is_host,
+                                int dir_in, u16 *pipecfg)
 {
         u16 type = 0;
         u16 bfre = 0;
@@ -451,14 +450,14 @@ static u16 usbhsp_setup_pipecfg(struct usbhs_pipe *pipe,
 
         /* EPNUM */
         epnum = 0; /* see usbhs_pipe_config_update() */
-
-        return  type    |
-                bfre    |
-                dblb    |
-                cntmd   |
-                dir     |
-                shtnak  |
-                epnum;
+        *pipecfg = type         |
+                   bfre         |
+                   dblb         |
+                   cntmd        |
+                   dir          |
+                   shtnak       |
+                   epnum;
+        return 0;
 }
 
 static u16 usbhsp_setup_pipebuff(struct usbhs_pipe *pipe)
@@ -703,7 +702,11 @@ struct usbhs_pipe *usbhs_pipe_malloc(struct usbhs_priv *priv,
                 return NULL;
         }
 
-        pipecfg  = usbhsp_setup_pipecfg(pipe, is_host, dir_in);
+        if (usbhsp_setup_pipecfg(pipe, is_host, dir_in, &pipecfg)) {
+                dev_err(dev, "can't setup pipe\n");
+                return NULL;
+        }
+
         pipebuf  = usbhsp_setup_pipebuff(pipe);
 
         usbhsp_pipe_select(pipe);