openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

greybus: es2: always set result value 

Make sure to always set the result value for ARPC instead of forcing
every caller to do it in order to avoid compiler warnings.

The ARPC result should still be ignored unless arpc_sync returns
-EREMOTEIO.

Signed-off-by: Johan Hovold <johan@hovoldconsulting.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Johan Hovold 2016-08-03 14:09:32 +02:00 committed by Greg Kroah-Hartman
parent c468999e6a
commit 4ae2d96263
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/staging/greybus/es2.c
View File

@ -611,7 +611,7 @@ static int cport_reset(struct gb_host_device *hd, u16 cport_id)
struct usb_device *udev = es2->usb_dev;
struct arpc_cport_reset_req req;
int retval;
int result = 0;
int result;
switch (cport_id) {
case GB_SVC_CPORT_ID:
@ -1184,6 +1184,8 @@ static int arpc_sync(struct es2_ap_dev *es2, u8 type, void *payload,
unsigned long flags;
int retval;
*result = 0;
rpc = arpc_alloc(payload, size, type);
if (!rpc)
return -ENOMEM;
@ -1205,11 +1207,12 @@ static int arpc_sync(struct es2_ap_dev *es2, u8 type, void *payload,
goto out_arpc_del;
}
*result = rpc->resp->result;
if (*result)
if (rpc->resp->result) {
retval = -EREMOTEIO;
else
*result = rpc->resp->result;
} else {
retval = 0;
}
out_arpc_del:
spin_lock_irqsave(&es2->arpc_lock, flags);