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>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
6fb650d43d
commit
72f595f3b5
@@ -391,9 +391,8 @@ void usbhs_pipe_set_trans_count_if_bulk(struct usbhs_pipe *pipe, int len)
|
|||||||
/*
|
/*
|
||||||
* pipe setup
|
* pipe setup
|
||||||
*/
|
*/
|
||||||
static u16 usbhsp_setup_pipecfg(struct usbhs_pipe *pipe,
|
static int usbhsp_setup_pipecfg(struct usbhs_pipe *pipe, int is_host,
|
||||||
int is_host,
|
int dir_in, u16 *pipecfg)
|
||||||
int dir_in)
|
|
||||||
{
|
{
|
||||||
u16 type = 0;
|
u16 type = 0;
|
||||||
u16 bfre = 0;
|
u16 bfre = 0;
|
||||||
@@ -451,14 +450,14 @@ static u16 usbhsp_setup_pipecfg(struct usbhs_pipe *pipe,
|
|||||||
|
|
||||||
/* EPNUM */
|
/* EPNUM */
|
||||||
epnum = 0; /* see usbhs_pipe_config_update() */
|
epnum = 0; /* see usbhs_pipe_config_update() */
|
||||||
|
*pipecfg = type |
|
||||||
return type |
|
|
||||||
bfre |
|
bfre |
|
||||||
dblb |
|
dblb |
|
||||||
cntmd |
|
cntmd |
|
||||||
dir |
|
dir |
|
||||||
shtnak |
|
shtnak |
|
||||||
epnum;
|
epnum;
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static u16 usbhsp_setup_pipebuff(struct usbhs_pipe *pipe)
|
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;
|
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);
|
pipebuf = usbhsp_setup_pipebuff(pipe);
|
||||||
|
|
||||||
usbhsp_pipe_select(pipe);
|
usbhsp_pipe_select(pipe);
|
||||||
|
|||||||
Reference in New Issue
Block a user