drivers/media/usb/gspca/cpia1.c: fix error return code

PATCH Applied Peter Senna Tschudin 2 participants 2 messages Sep 6, 2012 – Sep 9, 2012

Subsystems (3)

Media (V4L/DVB) Kernel janitors Gspca USB webcam driver

lore

Share & tools

lore

Peter Senna Tschudin

author

2012-09-06 15:24 UTC #0 lore raw

PATCH 14/14 drivers/media/usb/gspca/cpia1.c: fix error return code

From: Peter Senna Tschudin <[email protected]>

Convert a nonnegative error return code to a negative one, as returned elsewhere in the function.

A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
(
if@p1 (\(ret < 0\|ret != 0\))
{ ... return ret; }
|
ret@p1 = 0
)
... when != ret = e1

    when != &ret

*if(...)
{
... when != ret = e2
when forall
return ret;
}

// </smpl>

Signed-off-by Peter Senna Tschudin <[email protected]>

---
 drivers/media/usb/gspca/cpia1.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/media/usb/gspca/cpia1.c +1 -1

index 2499a88..b3ba47d 100644
@@ -751,7 +751,7 @@ static int goto_high_power(struct gspca_dev *gspca_dev)
 	if (signal_pending(current))
 		return -EINTR;
 
-	do_command(gspca_dev, CPIA_COMMAND_GetCameraStatus, 0, 0, 0, 0);
+	ret = do_command(gspca_dev, CPIA_COMMAND_GetCameraStatus, 0, 0, 0, 0);
 	if (ret)
 		return ret;

Hans de Goede

Applied

2012-09-09 21:55 UTC #1 lore raw

Hi,

Applied to my gspca tree and included in my pull-req for 3.7 which I just send out.

Thanks,

Hans

Quoted 51 lines · Peter Senna Tschudin

From: Peter Senna Tschudin <[email protected]>
Convert a nonnegative error return code to a negative one, as returned elsewhere in the function.
A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)
// <smpl>
(
if@p1 (\(ret < 0\|ret != 0\))
{ ... return ret; }
|
ret@p1 = 0
)
... when != ret = e1
     when != &ret
*if(...)
{
   ... when != ret = e2
       when forall
return ret;
}
// </smpl>
Signed-off-by Peter Senna Tschudin <[email protected]>
---
  drivers/media/usb/gspca/cpia1.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/usb/gspca/cpia1.c +1 -2
index 2499a88..b3ba47d 100644
@@ -751,7 +751,7 @@ static int goto_high_power(struct gspca_dev *gspca_dev)
  	if (signal_pending(current))
  		return -EINTR;
 
-	do_command(gspca_dev, CPIA_COMMAND_GetCameraStatus, 0, 0, 0, 0);
+	ret = do_command(gspca_dev, CPIA_COMMAND_GetCameraStatus, 0, 0, 0, 0);
  	if (ret)
  		return ret;
 
 
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html