Commit 50fd5e8c authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab

[media] hd29l2: fix sparse error and warnings

drivers/media/dvb-frontends/hd29l2.c:29:18: warning: Variable length array is used.
drivers/media/dvb-frontends/hd29l2.c:34:32: error: cannot size expression
drivers/media/dvb-frontends/hd29l2.c:125:5: warning: symbol 'hd29l2_rd_reg_mask' was not declared. Should it be static?

Variable length arrays are frowned upon, so replace with a fixed length and check
that there won't be a buffer overrun.
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Reviewed-by: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 7c424dd1
...@@ -22,20 +22,24 @@ ...@@ -22,20 +22,24 @@
#include "hd29l2_priv.h" #include "hd29l2_priv.h"
#define HD29L2_MAX_LEN (3)
/* write multiple registers */ /* write multiple registers */
static int hd29l2_wr_regs(struct hd29l2_priv *priv, u8 reg, u8 *val, int len) static int hd29l2_wr_regs(struct hd29l2_priv *priv, u8 reg, u8 *val, int len)
{ {
int ret; int ret;
u8 buf[2 + len]; u8 buf[2 + HD29L2_MAX_LEN];
struct i2c_msg msg[1] = { struct i2c_msg msg[1] = {
{ {
.addr = priv->cfg.i2c_addr, .addr = priv->cfg.i2c_addr,
.flags = 0, .flags = 0,
.len = sizeof(buf), .len = 2 + len,
.buf = buf, .buf = buf,
} }
}; };
if (len > HD29L2_MAX_LEN)
return -EINVAL;
buf[0] = 0x00; buf[0] = 0x00;
buf[1] = reg; buf[1] = reg;
memcpy(&buf[2], val, len); memcpy(&buf[2], val, len);
...@@ -118,7 +122,7 @@ static int hd29l2_wr_reg_mask(struct hd29l2_priv *priv, u8 reg, u8 val, u8 mask) ...@@ -118,7 +122,7 @@ static int hd29l2_wr_reg_mask(struct hd29l2_priv *priv, u8 reg, u8 val, u8 mask)
} }
/* read single register with mask */ /* read single register with mask */
int hd29l2_rd_reg_mask(struct hd29l2_priv *priv, u8 reg, u8 *val, u8 mask) static int hd29l2_rd_reg_mask(struct hd29l2_priv *priv, u8 reg, u8 *val, u8 mask)
{ {
int ret, i; int ret, i;
u8 tmp; u8 tmp;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment