From mboxrd@z Thu Jan 1 00:00:00 1970 From: SF Markus Elfring Date: Fri, 22 Sep 2017 17:06:01 +0000 Subject: [PATCH] [media] spca500: Use common error handling code in spca500_synch310() Message-Id: List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-media@vger.kernel.org, Hans Verkuil , Mauro Carvalho Chehab , Sakari Ailus Cc: LKML , kernel-janitors@vger.kernel.org From: Markus Elfring Date: Fri, 22 Sep 2017 18:45:07 +0200 Adjust a jump target so that a bit of exception handling can be better reused at the end of this function. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/media/usb/gspca/spca500.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/drivers/media/usb/gspca/spca500.c b/drivers/media/usb/gspca/spca500.c index da2d9027914c..1f224f5e5b19 100644 --- a/drivers/media/usb/gspca/spca500.c +++ b/drivers/media/usb/gspca/spca500.c @@ -501,7 +501,6 @@ static int spca500_full_reset(struct gspca_dev *gspca_dev) static int spca500_synch310(struct gspca_dev *gspca_dev) { - if (usb_set_interface(gspca_dev->dev, gspca_dev->iface, 0) < 0) { - PERR("Set packet size: set interface error"); - goto error; - } + if (usb_set_interface(gspca_dev->dev, gspca_dev->iface, 0) < 0) + goto report_failure; + spca500_ping310(gspca_dev); @@ -514,12 +513,12 @@ static int spca500_synch310(struct gspca_dev *gspca_dev) /* Windoze use pipe with altsetting 6 why 7 here */ - if (usb_set_interface(gspca_dev->dev, - gspca_dev->iface, - gspca_dev->alt) < 0) { - PERR("Set packet size: set interface error"); - goto error; - } + if (usb_set_interface(gspca_dev->dev, gspca_dev->iface, gspca_dev->alt) + < 0) + goto report_failure; + return 0; -error: + +report_failure: + PERR("Set packet size: set interface error"); return -EBUSY; } -- 2.14.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mout.web.de ([212.227.17.12]:49314 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752341AbdIVRGQ (ORCPT ); Fri, 22 Sep 2017 13:06:16 -0400 To: linux-media@vger.kernel.org, Hans Verkuil , Mauro Carvalho Chehab , Sakari Ailus Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Subject: [PATCH] [media] spca500: Use common error handling code in spca500_synch310() Message-ID: Date: Fri, 22 Sep 2017 19:06:01 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit Sender: linux-media-owner@vger.kernel.org List-ID: From: Markus Elfring Date: Fri, 22 Sep 2017 18:45:07 +0200 Adjust a jump target so that a bit of exception handling can be better reused at the end of this function. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/media/usb/gspca/spca500.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/drivers/media/usb/gspca/spca500.c b/drivers/media/usb/gspca/spca500.c index da2d9027914c..1f224f5e5b19 100644 --- a/drivers/media/usb/gspca/spca500.c +++ b/drivers/media/usb/gspca/spca500.c @@ -501,7 +501,6 @@ static int spca500_full_reset(struct gspca_dev *gspca_dev) static int spca500_synch310(struct gspca_dev *gspca_dev) { - if (usb_set_interface(gspca_dev->dev, gspca_dev->iface, 0) < 0) { - PERR("Set packet size: set interface error"); - goto error; - } + if (usb_set_interface(gspca_dev->dev, gspca_dev->iface, 0) < 0) + goto report_failure; + spca500_ping310(gspca_dev); @@ -514,12 +513,12 @@ static int spca500_synch310(struct gspca_dev *gspca_dev) /* Windoze use pipe with altsetting 6 why 7 here */ - if (usb_set_interface(gspca_dev->dev, - gspca_dev->iface, - gspca_dev->alt) < 0) { - PERR("Set packet size: set interface error"); - goto error; - } + if (usb_set_interface(gspca_dev->dev, gspca_dev->iface, gspca_dev->alt) + < 0) + goto report_failure; + return 0; -error: + +report_failure: + PERR("Set packet size: set interface error"); return -EBUSY; } -- 2.14.1