* [PATCH v3 1/2] media: imx-media-csi: Fix inconsistent IS_ERR and PTR_ERR
@ 2018-03-03 12:56 Fabio Estevam
2018-03-03 12:56 ` [PATCH v3 2/2] media: imx-media-csi: Do not propagate the error when pinctrl is not found Fabio Estevam
2018-04-16 13:16 ` [PATCH v3 1/2] media: imx-media-csi: Fix inconsistent IS_ERR and PTR_ERR Philipp Zabel
0 siblings, 2 replies; 7+ messages in thread
From: Fabio Estevam @ 2018-03-03 12:56 UTC (permalink / raw)
To: mchehab; +Cc: slongerbeam, p.zabel, gustavo, linux-media, Fabio Estevam
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 v2:
- None
Changes since v1:
- None
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 5a195f8..4f290a0 100644
--- a/drivers/staging/media/imx/imx-media-csi.c
+++ b/drivers/staging/media/imx/imx-media-csi.c
@@ -1798,7 +1798,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);
goto free;
}
--
2.7.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v3 2/2] media: imx-media-csi: Do not propagate the error when pinctrl is not found
2018-03-03 12:56 [PATCH v3 1/2] media: imx-media-csi: Fix inconsistent IS_ERR and PTR_ERR Fabio Estevam
@ 2018-03-03 12:56 ` Fabio Estevam
2018-03-10 15:53 ` Fabio Estevam
2018-04-16 13:16 ` [PATCH v3 1/2] media: imx-media-csi: Fix inconsistent IS_ERR and PTR_ERR Philipp Zabel
1 sibling, 1 reply; 7+ messages in thread
From: Fabio Estevam @ 2018-03-03 12:56 UTC (permalink / raw)
To: mchehab; +Cc: slongerbeam, p.zabel, gustavo, linux-media, Fabio Estevam
From: Fabio Estevam <fabio.estevam@nxp.com>
Since commit 52e17089d185 ("media: imx: Don't initialize vars that
won't be used") imx_csi_probe() fails to probe after propagating the
devm_pinctrl_get_select_default() error.
devm_pinctrl_get_select_default() may return -ENODEV when the CSI pinctrl
entry is not found, so better not to propagate the error in the -ENODEV
case to avoid a regression.
Suggested-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Reviewed-by: Steve Longerbeam <steve_longerbeam@mentor.com>
---
Changes since v2:
- Remove extraneous 'drivers/staging/media/imx/imx-media-csi.c' in commit log
Changes since v1:
- Add \n to the dbg message
drivers/staging/media/imx/imx-media-csi.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/staging/media/imx/imx-media-csi.c b/drivers/staging/media/imx/imx-media-csi.c
index 4f290a0..5af66f6 100644
--- a/drivers/staging/media/imx/imx-media-csi.c
+++ b/drivers/staging/media/imx/imx-media-csi.c
@@ -1799,7 +1799,10 @@ static int imx_csi_probe(struct platform_device *pdev)
pinctrl = devm_pinctrl_get_select_default(priv->dev);
if (IS_ERR(pinctrl)) {
ret = PTR_ERR(pinctrl);
- goto free;
+ dev_dbg(priv->dev,
+ "devm_pinctrl_get_select_default() failed: %d\n", ret);
+ if (ret != -ENODEV)
+ goto free;
}
ret = v4l2_async_register_subdev(&priv->sd);
--
2.7.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v3 2/2] media: imx-media-csi: Do not propagate the error when pinctrl is not found
2018-03-03 12:56 ` [PATCH v3 2/2] media: imx-media-csi: Do not propagate the error when pinctrl is not found Fabio Estevam
@ 2018-03-10 15:53 ` Fabio Estevam
2018-03-23 13:03 ` Fabio Estevam
0 siblings, 1 reply; 7+ messages in thread
From: Fabio Estevam @ 2018-03-10 15:53 UTC (permalink / raw)
To: Mauro Carvalho Chehab, Hans Verkuil, Sakari Ailus
Cc: Steve Longerbeam, Philipp Zabel, Gustavo A. R. Silva,
linux-media, Fabio Estevam
Hi,
On Sat, Mar 3, 2018 at 9:56 AM, Fabio Estevam <festevam@gmail.com> wrote:
> From: Fabio Estevam <fabio.estevam@nxp.com>
>
> Since commit 52e17089d185 ("media: imx: Don't initialize vars that
> won't be used") imx_csi_probe() fails to probe after propagating the
> devm_pinctrl_get_select_default() error.
>
> devm_pinctrl_get_select_default() may return -ENODEV when the CSI pinctrl
> entry is not found, so better not to propagate the error in the -ENODEV
> case to avoid a regression.
>
> Suggested-by: Philipp Zabel <p.zabel@pengutronix.de>
> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
> Reviewed-by: Steve Longerbeam <steve_longerbeam@mentor.com>
A gentle ping.
This series fixes a regression on the imx-media-csi driver.
Thanks
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v3 2/2] media: imx-media-csi: Do not propagate the error when pinctrl is not found
2018-03-10 15:53 ` Fabio Estevam
@ 2018-03-23 13:03 ` Fabio Estevam
2018-03-23 13:10 ` Hans Verkuil
0 siblings, 1 reply; 7+ messages in thread
From: Fabio Estevam @ 2018-03-23 13:03 UTC (permalink / raw)
To: Mauro Carvalho Chehab, Hans Verkuil, Sakari Ailus
Cc: Steve Longerbeam, Philipp Zabel, Gustavo A. R. Silva,
linux-media, Fabio Estevam
Hi Mauro and Hans,
On Sat, Mar 10, 2018 at 12:53 PM, Fabio Estevam <festevam@gmail.com> wrote:
> Hi,
>
> On Sat, Mar 3, 2018 at 9:56 AM, Fabio Estevam <festevam@gmail.com> wrote:
>> From: Fabio Estevam <fabio.estevam@nxp.com>
>>
>> Since commit 52e17089d185 ("media: imx: Don't initialize vars that
>> won't be used") imx_csi_probe() fails to probe after propagating the
>> devm_pinctrl_get_select_default() error.
>>
>> devm_pinctrl_get_select_default() may return -ENODEV when the CSI pinctrl
>> entry is not found, so better not to propagate the error in the -ENODEV
>> case to avoid a regression.
>>
>> Suggested-by: Philipp Zabel <p.zabel@pengutronix.de>
>> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
>> Reviewed-by: Steve Longerbeam <steve_longerbeam@mentor.com>
>
> A gentle ping.
>
> This series fixes a regression on the imx-media-csi driver.
Could you please consider applying this series that fixes the probe of
the imx-media-csi driver?
Thanks
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v3 2/2] media: imx-media-csi: Do not propagate the error when pinctrl is not found
2018-03-23 13:03 ` Fabio Estevam
@ 2018-03-23 13:10 ` Hans Verkuil
0 siblings, 0 replies; 7+ messages in thread
From: Hans Verkuil @ 2018-03-23 13:10 UTC (permalink / raw)
To: Fabio Estevam, Mauro Carvalho Chehab, Sakari Ailus
Cc: Steve Longerbeam, Philipp Zabel, Gustavo A. R. Silva,
linux-media, Fabio Estevam
On 03/23/18 14:03, Fabio Estevam wrote:
> Hi Mauro and Hans,
>
> On Sat, Mar 10, 2018 at 12:53 PM, Fabio Estevam <festevam@gmail.com> wrote:
>> Hi,
>>
>> On Sat, Mar 3, 2018 at 9:56 AM, Fabio Estevam <festevam@gmail.com> wrote:
>>> From: Fabio Estevam <fabio.estevam@nxp.com>
>>>
>>> Since commit 52e17089d185 ("media: imx: Don't initialize vars that
>>> won't be used") imx_csi_probe() fails to probe after propagating the
>>> devm_pinctrl_get_select_default() error.
>>>
>>> devm_pinctrl_get_select_default() may return -ENODEV when the CSI pinctrl
>>> entry is not found, so better not to propagate the error in the -ENODEV
>>> case to avoid a regression.
>>>
>>> Suggested-by: Philipp Zabel <p.zabel@pengutronix.de>
>>> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
>>> Reviewed-by: Steve Longerbeam <steve_longerbeam@mentor.com>
>>
>> A gentle ping.
>>
>> This series fixes a regression on the imx-media-csi driver.
>
> Could you please consider applying this series that fixes the probe of
> the imx-media-csi driver?
It's delegated to Sakari.
Sakari, if you're busy then just let me know and I can take it.
Regards,
Hans
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v3 1/2] media: imx-media-csi: Fix inconsistent IS_ERR and PTR_ERR
2018-03-03 12:56 [PATCH v3 1/2] media: imx-media-csi: Fix inconsistent IS_ERR and PTR_ERR Fabio Estevam
2018-03-03 12:56 ` [PATCH v3 2/2] media: imx-media-csi: Do not propagate the error when pinctrl is not found Fabio Estevam
@ 2018-04-16 13:16 ` Philipp Zabel
2018-04-16 17:32 ` Fabio Estevam
1 sibling, 1 reply; 7+ messages in thread
From: Philipp Zabel @ 2018-04-16 13:16 UTC (permalink / raw)
To: Fabio Estevam, mchehab, Hans Verkuil
Cc: slongerbeam, gustavo, linux-media, Fabio Estevam
Hi,
On Sat, 2018-03-03 at 09:56 -0300, Fabio Estevam wrote:
> 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 v2:
> - None
> Changes since v1:
> - None
>
> 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 5a195f8..4f290a0 100644
> --- a/drivers/staging/media/imx/imx-media-csi.c
> +++ b/drivers/staging/media/imx/imx-media-csi.c
> @@ -1798,7 +1798,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);
The second patch is applied now, but this part is still missing in
v4.17-rc1, causing the CSI subdev probe to fail:
imx-ipuv3-csi: probe of imx-ipuv3-csi.0 failed with error -1369528304
imx-ipuv3-csi: probe of imx-ipuv3-csi.1 failed with error -1369528304
imx-ipuv3-csi: probe of imx-ipuv3-csi.5 failed with error -1369528304
imx-ipuv3-csi: probe of imx-ipuv3-csi.6 failed with error -1369528304
regards
Philipp
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v3 1/2] media: imx-media-csi: Fix inconsistent IS_ERR and PTR_ERR
2018-04-16 13:16 ` [PATCH v3 1/2] media: imx-media-csi: Fix inconsistent IS_ERR and PTR_ERR Philipp Zabel
@ 2018-04-16 17:32 ` Fabio Estevam
0 siblings, 0 replies; 7+ messages in thread
From: Fabio Estevam @ 2018-04-16 17:32 UTC (permalink / raw)
To: Philipp Zabel
Cc: Mauro Carvalho Chehab, Hans Verkuil, Steve Longerbeam,
Gustavo A. R. Silva, linux-media, Fabio Estevam
On Mon, Apr 16, 2018 at 10:16 AM, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> The second patch is applied now, but this part is still missing in
> v4.17-rc1, causing the CSI subdev probe to fail:
>
> imx-ipuv3-csi: probe of imx-ipuv3-csi.0 failed with error -1369528304
> imx-ipuv3-csi: probe of imx-ipuv3-csi.1 failed with error -1369528304
> imx-ipuv3-csi: probe of imx-ipuv3-csi.5 failed with error -1369528304
> imx-ipuv3-csi: probe of imx-ipuv3-csi.6 failed with error -1369528304
Yes, this original patch does not apply against 4.17-rc1 anymore, so I
rebased and resend it.
Thanks
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2018-04-16 17:32 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-03 12:56 [PATCH v3 1/2] media: imx-media-csi: Fix inconsistent IS_ERR and PTR_ERR Fabio Estevam
2018-03-03 12:56 ` [PATCH v3 2/2] media: imx-media-csi: Do not propagate the error when pinctrl is not found Fabio Estevam
2018-03-10 15:53 ` Fabio Estevam
2018-03-23 13:03 ` Fabio Estevam
2018-03-23 13:10 ` Hans Verkuil
2018-04-16 13:16 ` [PATCH v3 1/2] media: imx-media-csi: Fix inconsistent IS_ERR and PTR_ERR Philipp Zabel
2018-04-16 17:32 ` Fabio Estevam
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).