2017-08-23 13:30:58

by Arnd Bergmann

[permalink] [raw]

Subject: [PATCH] media: omap3isp: fix uninitialized variable use

---

A debug printk statement was copied incorrectly into the new
csi1 parser code and causes a warning there:

drivers/media/platform/omap3isp/isp.c: In function 'isp_probe':
include/linux/dynamic_debug.h:134:3: error: 'i' may be used uninitialized in this function [-Werror=maybe-uninitialized]

Since there is only one lane, the index is never set. This
changes the debug print to always print a zero instead,
keeping the original format of the message.

Fixes: 9211434bad30 ("media: omap3isp: Parse CSI1 configuration from the device tree")
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/media/platform/omap3isp/isp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c
index 83aea08b832d..30c825bf80d9 100644
--- a/drivers/media/platform/omap3isp/isp.c
+++ b/drivers/media/platform/omap3isp/isp.c
@@ -2092,7 +2092,7 @@ static int isp_fwnode_parse(struct device *dev, struct fwnode_handle *fwnode,
buscfg->bus.ccp2.lanecfg.data[0].pol =
vep.bus.mipi_csi1.lane_polarity[1];

- dev_dbg(dev, "data lane %u polarity %u, pos %u\n", i,
+ dev_dbg(dev, "data lane 0 polarity %u, pos %u\n",
buscfg->bus.ccp2.lanecfg.data[0].pol,
buscfg->bus.ccp2.lanecfg.data[0].pos);

--
2.9.0

2017-08-23 13:55:25

by Laurent Pinchart

[permalink] [raw]

Subject: Re: [PATCH] media: omap3isp: fix uninitialized variable use

---

Hi Arnd,

Thank you for the patch.

On Wednesday, 23 August 2017 16:30:19 EEST Arnd Bergmann wrote:
> A debug printk statement was copied incorrectly into the new
> csi1 parser code and causes a warning there:
>
> drivers/media/platform/omap3isp/isp.c: In function 'isp_probe':
> include/linux/dynamic_debug.h:134:3: error: 'i' may be used uninitialized in
> this function [-Werror=maybe-uninitialized]
>
> Since there is only one lane, the index is never set. This
> changes the debug print to always print a zero instead,
> keeping the original format of the message.
>
> Fixes: 9211434bad30 ("media: omap3isp: Parse CSI1 configuration from the
> device tree")
> Signed-off-by: Arnd Bergmann <[email protected]>

Reviewed-by: Laurent Pinchart <[email protected]>

> ---
> drivers/media/platform/omap3isp/isp.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/media/platform/omap3isp/isp.c
> b/drivers/media/platform/omap3isp/isp.c index 83aea08b832d..30c825bf80d9
> 100644
> --- a/drivers/media/platform/omap3isp/isp.c
> +++ b/drivers/media/platform/omap3isp/isp.c
> @@ -2092,7 +2092,7 @@ static int isp_fwnode_parse(struct device *dev, struct
> fwnode_handle *fwnode, buscfg->bus.ccp2.lanecfg.data[0].pol =
> vep.bus.mipi_csi1.lane_polarity[1];
>
> - dev_dbg(dev, "data lane %u polarity %u, pos %u\n", i,
> + dev_dbg(dev, "data lane 0 polarity %u, pos %u\n",
> buscfg->bus.ccp2.lanecfg.data[0].pol,
> buscfg->bus.ccp2.lanecfg.data[0].pos);


--
Regards,

Laurent Pinchart

2017-08-23 13:58:32

by Sakari Ailus

[permalink] [raw]

Subject: Re: [PATCH] media: omap3isp: fix uninitialized variable use

---

Hi Arnd,

On Wed, Aug 23, 2017 at 03:30:19PM +0200, Arnd Bergmann wrote:
> A debug printk statement was copied incorrectly into the new
> csi1 parser code and causes a warning there:
>
> drivers/media/platform/omap3isp/isp.c: In function 'isp_probe':
> include/linux/dynamic_debug.h:134:3: error: 'i' may be used uninitialized in this function [-Werror=maybe-uninitialized]
>
> Since there is only one lane, the index is never set. This
> changes the debug print to always print a zero instead,
> keeping the original format of the message.
>
> Fixes: 9211434bad30 ("media: omap3isp: Parse CSI1 configuration from the device tree")
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> drivers/media/platform/omap3isp/isp.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c
> index 83aea08b832d..30c825bf80d9 100644
> --- a/drivers/media/platform/omap3isp/isp.c
> +++ b/drivers/media/platform/omap3isp/isp.c
> @@ -2092,7 +2092,7 @@ static int isp_fwnode_parse(struct device *dev, struct fwnode_handle *fwnode,
> buscfg->bus.ccp2.lanecfg.data[0].pol =
> vep.bus.mipi_csi1.lane_polarity[1];
>
> - dev_dbg(dev, "data lane %u polarity %u, pos %u\n", i,
> + dev_dbg(dev, "data lane 0 polarity %u, pos %u\n",
> buscfg->bus.ccp2.lanecfg.data[0].pol,
> buscfg->bus.ccp2.lanecfg.data[0].pos);
>

Thanks! I removed "0 "; CCP2 always has a single lane. The patch is now:

diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c
index 83aea08b832d..1a428fe9f070 100644
--- a/drivers/media/platform/omap3isp/isp.c
+++ b/drivers/media/platform/omap3isp/isp.c
@@ -2092,7 +2092,7 @@ static int isp_fwnode_parse(struct device *dev, struct fwnode_handle *fwnode,
buscfg->bus.ccp2.lanecfg.data[0].pol =
vep.bus.mipi_csi1.lane_polarity[1];

- dev_dbg(dev, "data lane %u polarity %u, pos %u\n", i,
+ dev_dbg(dev, "data lane polarity %u, pos %u\n",
buscfg->bus.ccp2.lanecfg.data[0].pol,
buscfg->bus.ccp2.lanecfg.data[0].pos);


--
Sakari Ailus
e-mail: [email protected]

2017-08-23 15:35:40

by Sebastian Reichel

[permalink] [raw]

Subject: Re: [PATCH] media: omap3isp: fix uninitialized variable use

---

Hi,

On Wed, Aug 23, 2017 at 04:58:27PM +0300, Sakari Ailus wrote:
> On Wed, Aug 23, 2017 at 03:30:19PM +0200, Arnd Bergmann wrote:
> > A debug printk statement was copied incorrectly into the new
> > csi1 parser code and causes a warning there:
> >
> > drivers/media/platform/omap3isp/isp.c: In function 'isp_probe':
> > include/linux/dynamic_debug.h:134:3: error: 'i' may be used uninitialized in this function [-Werror=maybe-uninitialized]
> >
> > Since there is only one lane, the index is never set. This
> > changes the debug print to always print a zero instead,
> > keeping the original format of the message.
> >
> > Fixes: 9211434bad30 ("media: omap3isp: Parse CSI1 configuration from the device tree")
> > Signed-off-by: Arnd Bergmann <[email protected]>
> > ---
> > drivers/media/platform/omap3isp/isp.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c
> > index 83aea08b832d..30c825bf80d9 100644
> > --- a/drivers/media/platform/omap3isp/isp.c
> > +++ b/drivers/media/platform/omap3isp/isp.c
> > @@ -2092,7 +2092,7 @@ static int isp_fwnode_parse(struct device *dev, struct fwnode_handle *fwnode,
> > buscfg->bus.ccp2.lanecfg.data[0].pol =
> > vep.bus.mipi_csi1.lane_polarity[1];
> >
> > - dev_dbg(dev, "data lane %u polarity %u, pos %u\n", i,
> > + dev_dbg(dev, "data lane 0 polarity %u, pos %u\n",
> > buscfg->bus.ccp2.lanecfg.data[0].pol,
> > buscfg->bus.ccp2.lanecfg.data[0].pos);
> >
>
> Thanks! I removed "0 "; CCP2 always has a single lane. The patch is now:
>
> diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c
> index 83aea08b832d..1a428fe9f070 100644
> --- a/drivers/media/platform/omap3isp/isp.c
> +++ b/drivers/media/platform/omap3isp/isp.c
> @@ -2092,7 +2092,7 @@ static int isp_fwnode_parse(struct device *dev, struct fwnode_handle *fwnode,
> buscfg->bus.ccp2.lanecfg.data[0].pol =
> vep.bus.mipi_csi1.lane_polarity[1];
>
> - dev_dbg(dev, "data lane %u polarity %u, pos %u\n", i,
> + dev_dbg(dev, "data lane polarity %u, pos %u\n",
> buscfg->bus.ccp2.lanecfg.data[0].pol,
> buscfg->bus.ccp2.lanecfg.data[0].pos);

Reviewed-by: Sebastian Reichel <[email protected]>

-- Sebastian

---

Attachments:

(No filename) (2.27 kB)
signature.asc (833.00 B)
Download all attachments