Message ID | 1523899736-31360-1-git-send-email-festevam@gmail.com (mailing list archive) |
---|---|
State | Accepted, archived |
Delegated to: | Hans Verkuil |
Headers |
Received: from vger.kernel.org ([209.132.180.67]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from <linux-media-owner@vger.kernel.org>) id 1f87y5-0007Og-0Y; Mon, 16 Apr 2018 17:31:05 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752829AbeDPRbD (ORCPT <rfc822;mkrufky@linuxtv.org> + 1 other); Mon, 16 Apr 2018 13:31:03 -0400 Received: from mail-qk0-f193.google.com ([209.85.220.193]:38959 "EHLO mail-qk0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752652AbeDPRbC (ORCPT <rfc822;linux-media@vger.kernel.org>); Mon, 16 Apr 2018 13:31:02 -0400 Received: by mail-qk0-f193.google.com with SMTP id j73so17420590qke.6 for <linux-media@vger.kernel.org>; Mon, 16 Apr 2018 10:31:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=3orn5PvoMlFfKWVKMtA3QZ08owS+yn3Ors4sltBsvXo=; b=C4wLi57a2CLSTiPag2+lBM3/hydtSpX1oHHVMlM1uLDhlxy4wdcPNiSjrno8lwclOU Zmb9XBuXPET1roQOPCSYfeQ9a9xVvcIsn1Js/su/chxSjK0zIAHWK00ry815lN7vro9C fWZcfwXQ60+cv5KxKvm+aqQ1vvxzGZGrfbbaiMPZd/lDEsxhBgE6HtSa2xnyX3YpqP4l 3RGxmQTMGJIlyHUdfMXbBCrECq+U+aORdSwG0MZ2llpHc5ShY408J7KTyJR4OXw8X/me pQdtlbsgr7oAc64v5Wv/Gh8mWM/p/2wqNtwWnYNZ0sJ6VlxB50rMPN52f4ObecDpZXnk 5zvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=3orn5PvoMlFfKWVKMtA3QZ08owS+yn3Ors4sltBsvXo=; b=h3mMNdzvtjwqL/v+0nt0Ua9e7HuwxID2k5BOdSpxN3N2mvEYZLHlazstZFxsMIyT0J YO2d4pIu3SH/3OfXjLqfJiX1B8mESotHeSMhgZPyjuEVMg4eCsTLYCFVf6Qv/2KeWrfh NbBVFDLVmc7HEiXWUqQTVr8aKSFWcVsz106QynLkXQphMQgtEfowbEMwHzh0V0SfKqPt pC1SJ6dCkxchz/GzhBTrZQvGgSHcxlRqVvB6tpp5+/9dG6droTmpWqjRCgFKt9b5ivDw zI7lKOsxKToL78st15w79yaW4ev/5F04y8he0ajsZuRENjjaZ89LaMQK4ZNgjyj/yluO 17LA== X-Gm-Message-State: ALQs6tCtrBrflKT4EczXlH5iQ4L+WBcyT1ZP6GSIHAzuBXV7J9pquIiT fQjEPW6lccDZEJ2Tv2z3ktNTew== X-Google-Smtp-Source: AIpwx4++L13KufMlTt8DzLu3A0Ak6eQBpXpNh4/giSHJaeoEvc5cwxSrEOUFLKV1eUFmvBfpPCWHbQ== X-Received: by 10.55.167.5 with SMTP id q5mr17591513qke.273.1523899862171; Mon, 16 Apr 2018 10:31:02 -0700 (PDT) Received: from localhost.localdomain ([187.180.183.211]) by smtp.gmail.com with ESMTPSA id s39sm10417667qts.43.2018.04.16.10.30.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 16 Apr 2018 10:31:01 -0700 (PDT) From: Fabio Estevam <festevam@gmail.com> To: mchehab@kernel.org Cc: hverkuil@xs4all.nl, p.zabel@pengutronix.de, gustavo@embeddedor.com, slongerbeam@gmail.com, linux-media@vger.kernel.org, Fabio Estevam <fabio.estevam@nxp.com> Subject: [PATCH v2] media: imx-media-csi: Fix inconsistent IS_ERR and PTR_ERR Date: Mon, 16 Apr 2018 14:28:56 -0300 Message-Id: <1523899736-31360-1-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: <linux-media.vger.kernel.org> X-Mailing-List: linux-media@vger.kernel.org |
Commit Message
Fabio Estevam
April 16, 2018, 5:28 p.m. UTC
From: From: Gustavo A. R. Silva <gustavo@embeddedor.com> Fix inconsistent IS_ERR and PTR_ERR in imx_csi_probe. The proper pointer to be passed as argument is pinctrl instead of priv->vdev. This issue was detected with the help of Coccinelle. Fixes: 52e17089d185 ("media: imx: Don't initialize vars that won't be used") Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> Acked-by: Philipp Zabel <p.zabel@pengutronix.de> --- Changes since v1: - Rebased against 4.17-rc1 drivers/staging/media/imx/imx-media-csi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Comments
Hi Hans, Unfortunately this one missed to be applied into 4.17-rc and now the imx-media-csi driver does not probe. Please consider applying it for 4.17-rc3 to avoid the regression. Thanks On Mon, Apr 16, 2018 at 2:28 PM, Fabio Estevam <festevam@gmail.com> wrote: > From: From: Gustavo A. R. Silva <gustavo@embeddedor.com> > > Fix inconsistent IS_ERR and PTR_ERR in imx_csi_probe. > The proper pointer to be passed as argument is pinctrl > instead of priv->vdev. > > This issue was detected with the help of Coccinelle. > > Fixes: 52e17089d185 ("media: imx: Don't initialize vars that won't be used") > Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com> > Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> > Acked-by: Philipp Zabel <p.zabel@pengutronix.de> > --- > Changes since v1: > - Rebased against 4.17-rc1 > > drivers/staging/media/imx/imx-media-csi.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/staging/media/imx/imx-media-csi.c b/drivers/staging/media/imx/imx-media-csi.c > index 16cab40..aeab05f 100644 > --- a/drivers/staging/media/imx/imx-media-csi.c > +++ b/drivers/staging/media/imx/imx-media-csi.c > @@ -1799,7 +1799,7 @@ static int imx_csi_probe(struct platform_device *pdev) > priv->dev->of_node = pdata->of_node; > pinctrl = devm_pinctrl_get_select_default(priv->dev); > if (IS_ERR(pinctrl)) { > - ret = PTR_ERR(priv->vdev); > + ret = PTR_ERR(pinctrl); > dev_dbg(priv->dev, > "devm_pinctrl_get_select_default() failed: %d\n", ret); > if (ret != -ENODEV) > -- > 2.7.4 >
On Mon, 2018-04-23 at 08:55 -0300, Fabio Estevam wrote: > Hi Hans, > > Unfortunately this one missed to be applied into 4.17-rc and now the > imx-media-csi driver does not probe. > > Please consider applying it for 4.17-rc3 to avoid the regression. > > Thanks > > On Mon, Apr 16, 2018 at 2:28 PM, Fabio Estevam <festevam@gmail.com> wrote: > > From: From: Gustavo A. R. Silva <gustavo@embeddedor.com> > > > > Fix inconsistent IS_ERR and PTR_ERR in imx_csi_probe. > > The proper pointer to be passed as argument is pinctrl > > instead of priv->vdev. > > > > This issue was detected with the help of Coccinelle. > > > > Fixes: 52e17089d185 ("media: imx: Don't initialize vars that won't be used") > > Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com> > > Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> > > Acked-by: Philipp Zabel <p.zabel@pengutronix.de> Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de> Tested-by: Philipp Zabel <p.zabel@pengutronix.de> regards Philipp
diff --git a/drivers/staging/media/imx/imx-media-csi.c b/drivers/staging/media/imx/imx-media-csi.c index 16cab40..aeab05f 100644 --- a/drivers/staging/media/imx/imx-media-csi.c +++ b/drivers/staging/media/imx/imx-media-csi.c @@ -1799,7 +1799,7 @@ static int imx_csi_probe(struct platform_device *pdev) priv->dev->of_node = pdata->of_node; pinctrl = devm_pinctrl_get_select_default(priv->dev); if (IS_ERR(pinctrl)) { - ret = PTR_ERR(priv->vdev); + ret = PTR_ERR(pinctrl); dev_dbg(priv->dev, "devm_pinctrl_get_select_default() failed: %d\n", ret); if (ret != -ENODEV)