From: Johan Hovold <johan@hovoldconsulting.com>
Date: Wed, 3 Aug 2016 12:09:32 +0000 (+0200)
Subject: greybus: es2: always set result value
X-Git-Tag: v4.14-rc1~2366^2~378^2~21^2~79
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4ae2d962637e4a002d1f0884dceec800c79b3ea4;p=platform%2Fkernel%2Flinux-rpi.git

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>
---

diff --git a/drivers/staging/greybus/es2.c b/drivers/staging/greybus/es2.c
index 0850b59..c31124d 100644
--- a/drivers/staging/greybus/es2.c
+++ b/drivers/staging/greybus/es2.c
@@ -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);