From patchwork Tue Sep 4 16:14:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Senna Tschudin X-Patchwork-Id: 14169 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1T8vna-0000aS-TL for patchwork@linuxtv.org; Tue, 04 Sep 2012 18:16:22 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-2) with esmtp for id 1T8vna-0006K9-Gu; Tue, 04 Sep 2012 18:16:22 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757367Ab2IDQOw (ORCPT ); Tue, 4 Sep 2012 12:14:52 -0400 Received: from mail-wg0-f44.google.com ([74.125.82.44]:51844 "EHLO mail-wg0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757277Ab2IDQOv (ORCPT ); Tue, 4 Sep 2012 12:14:51 -0400 Received: by wgbdr13 with SMTP id dr13so5825722wgb.1 for ; Tue, 04 Sep 2012 09:14:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=NC/zhP4tNqYygeyNDk+WzbLnXEn3GF6V7xwU/LQGduE=; b=JOVg6hVmOBWvH/nReabqTmXw+i6gRhjOBDSqMhI7FSROnFMiwaJK2k8L9u4xGY3r8R 7xVwwzKHrxxoGFGqmRY3KpqUHUk4DBiO4gaRpgITV1GEfezHRTPg6zaV/lBhnNRyTpK2 EPL6E6q5b5/yVNGFsZtIrKwhmVhJuv4LQXvIVWw+aGPvPvwtHggmH/VovOskxq1T5xEw scih1iD/2kBSCCrX56N9RLlMtSwx+Ph9zjBwHjHJnBudq8YutDbJixvr/5baJf/D8Piw dtyEZzO5Q+berXtbE7sKFBQTSFD+ZDgex9xWEIcHQiy/ZhnURgB+OKglzIL7nAKxzo12 O5cg== Received: by 10.180.14.8 with SMTP id l8mr31754919wic.6.1346775289444; Tue, 04 Sep 2012 09:14:49 -0700 (PDT) Received: from localhost.localdomain ([132.227.100.38]) by mx.google.com with ESMTPS id l6sm24969613wiz.4.2012.09.04.09.14.48 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 04 Sep 2012 09:14:48 -0700 (PDT) From: Peter Senna Tschudin To: Mauro Carvalho Chehab Cc: kernel-janitors@vger.kernel.org, Julia.Lawall@lip6.fr, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/5] drivers/media/platform/omap3isp/isp.c: fix error return code Date: Tue, 4 Sep 2012 18:14:25 +0200 Message-Id: <1346775269-12191-1-git-send-email-peter.senna@gmail.com> X-Mailer: git-send-email 1.7.11.4 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.9.4.160316 X-PMX-Spam: Gauge=IIIIIIIII, Probability=9%, Report=' FORGED_FROM_GMAIL 0.1, HTML_NO_HTTP 0.1, MULTIPLE_RCPTS 0.1, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1300_1399 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, FROM_NAME_PHRASE 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HAS_FROM 0, __HAS_HTML 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __URI_NO_WWW 0, __URI_NS ' From: Peter Senna Tschudin 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/) // ( if@p1 (\(ret < 0\|ret != 0\)) { ... return ret; } | ret@p1 = 0 ) ... when != ret = e1 when != &ret *if(...) { ... when != ret = e2 when forall return ret; } // Signed-off-by: Peter Senna Tschudin --- drivers/media/platform/omap3isp/isp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c index e0096e0..91fcaef 100644 --- a/drivers/media/platform/omap3isp/isp.c +++ b/drivers/media/platform/omap3isp/isp.c @@ -2102,8 +2102,10 @@ static int __devinit isp_probe(struct platform_device *pdev) if (ret < 0) goto error; - if (__omap3isp_get(isp, false) == NULL) + if (__omap3isp_get(isp, false) == NULL) { + ret = -EBUSY; /* Not sure if EBUSY is best for here */ goto error; + } ret = isp_reset(isp); if (ret < 0)