aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2014-09-22 03:58:53 -0400
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-09-23 15:13:44 -0400
commit271430efb21223e9654fcae58955305c5f70663b (patch)
tree6cb560ad0b53ee51a758756e3bfcc2436777ae45
parent146af9cb809c6b6a0f4e215570fb3f397cd55a21 (diff)
[media] as102: remove some unneeded checks
We know "ret" is zero so we don't need to test for it. It upsets the static checkers when we test stuff but we know the answer. drivers/media/usb/as102/as102_usb_drv.c:164 as102_send_ep1() warn: we tested 'ret' before and it was 'false' drivers/media/usb/as102/as102_usb_drv.c:189 as102_read_ep2() warn: we tested 'ret' before and it was 'false' Also, we don't need to initialize "ret". Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-rw-r--r--drivers/media/usb/as102/as102_usb_drv.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/usb/as102/as102_usb_drv.c b/drivers/media/usb/as102/as102_usb_drv.c
index 43133df771ff..3f669066ccf6 100644
--- a/drivers/media/usb/as102/as102_usb_drv.c
+++ b/drivers/media/usb/as102/as102_usb_drv.c
@@ -145,7 +145,7 @@ static int as102_send_ep1(struct as10x_bus_adapter_t *bus_adap,
145 int send_buf_len, 145 int send_buf_len,
146 int swap32) 146 int swap32)
147{ 147{
148 int ret = 0, actual_len; 148 int ret, actual_len;
149 149
150 ret = usb_bulk_msg(bus_adap->usb_dev, 150 ret = usb_bulk_msg(bus_adap->usb_dev,
151 usb_sndbulkpipe(bus_adap->usb_dev, 1), 151 usb_sndbulkpipe(bus_adap->usb_dev, 1),
@@ -161,13 +161,13 @@ static int as102_send_ep1(struct as10x_bus_adapter_t *bus_adap,
161 actual_len, send_buf_len); 161 actual_len, send_buf_len);
162 return -1; 162 return -1;
163 } 163 }
164 return ret ? ret : actual_len; 164 return actual_len;
165} 165}
166 166
167static int as102_read_ep2(struct as10x_bus_adapter_t *bus_adap, 167static int as102_read_ep2(struct as10x_bus_adapter_t *bus_adap,
168 unsigned char *recv_buf, int recv_buf_len) 168 unsigned char *recv_buf, int recv_buf_len)
169{ 169{
170 int ret = 0, actual_len; 170 int ret, actual_len;
171 171
172 if (recv_buf == NULL) 172 if (recv_buf == NULL)
173 return -EINVAL; 173 return -EINVAL;
@@ -186,7 +186,7 @@ static int as102_read_ep2(struct as10x_bus_adapter_t *bus_adap,
186 actual_len, recv_buf_len); 186 actual_len, recv_buf_len);
187 return -1; 187 return -1;
188 } 188 }
189 return ret ? ret : actual_len; 189 return actual_len;
190} 190}
191 191
192static struct as102_priv_ops_t as102_priv_ops = { 192static struct as102_priv_ops_t as102_priv_ops = {