diff mbox

media: omap3isp: fix uninitialized variable use

Message ID 20170823133044.686146-1-arnd@arndb.de
State Accepted
Commit 5160fb4bbd7add491b93fbf859cae5804f3de8bf
Headers show

Commit Message

Arnd Bergmann Aug. 23, 2017, 1:30 p.m. UTC 
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 <arnd@arndb.de>

---
 drivers/media/platform/omap3isp/isp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.9.0

Comments

Laurent Pinchart Aug. 23, 2017, 1:55 p.m. UTC | #1 
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 <arnd@arndb.de>


Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>


> ---

>  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
Sakari Ailus Aug. 23, 2017, 1:58 p.m. UTC | #2 
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 <arnd@arndb.de>

> ---

>  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:


-- 
Sakari Ailus
e-mail: sakari.ailus@iki.fidiff --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);
Sebastian Reichel Aug. 23, 2017, 3:35 p.m. UTC | #3 
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 <arnd@arndb.de>

> > ---

> >  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 <sebastian.reichel@collabora.co.uk>


-- Sebastian
diff mbox

Patch

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);