summaryrefslogtreecommitdiff
path: root/drivers/media/dvb-frontends/m88ds3103.c
diff options
context:
space:
mode:
authorAntti Palosaari <crope@iki.fi>2013-11-07 17:35:43 -0300
committerMauro Carvalho Chehab <m.chehab@samsung.com>2013-12-19 09:20:29 -0200
commit63c80f70435c5ecac0f94a1331a7dee249ba345b (patch)
treeb04e802df4836a897835a255ab9abd8439937a03 /drivers/media/dvb-frontends/m88ds3103.c
parent050ae82c35fd8bb72b27becb1b9d19c7f5978234 (diff)
[media] m88ds3103: do not use dynamic stack allocation
I2C transfer were using dynamic stack allocation. Get rid of it. Signed-off-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/dvb-frontends/m88ds3103.c')
-rw-r--r--drivers/media/dvb-frontends/m88ds3103.c18
1 files changed, 14 insertions, 4 deletions
diff --git a/drivers/media/dvb-frontends/m88ds3103.c b/drivers/media/dvb-frontends/m88ds3103.c
index 91b3729db604..302c923aa306 100644
--- a/drivers/media/dvb-frontends/m88ds3103.c
+++ b/drivers/media/dvb-frontends/m88ds3103.c
@@ -26,17 +26,22 @@ static struct dvb_frontend_ops m88ds3103_ops;
static int m88ds3103_wr_regs(struct m88ds3103_priv *priv,
u8 reg, const u8 *val, int len)
{
+#define MAX_WR_LEN 32
+#define MAX_WR_XFER_LEN (MAX_WR_LEN + 1)
int ret;
- u8 buf[1 + len];
+ u8 buf[MAX_WR_XFER_LEN];
struct i2c_msg msg[1] = {
{
.addr = priv->cfg->i2c_addr,
.flags = 0,
- .len = sizeof(buf),
+ .len = 1 + len,
.buf = buf,
}
};
+ if (WARN_ON(len > MAX_WR_LEN))
+ return -EINVAL;
+
buf[0] = reg;
memcpy(&buf[1], val, len);
@@ -59,8 +64,10 @@ static int m88ds3103_wr_regs(struct m88ds3103_priv *priv,
static int m88ds3103_rd_regs(struct m88ds3103_priv *priv,
u8 reg, u8 *val, int len)
{
+#define MAX_RD_LEN 3
+#define MAX_RD_XFER_LEN (MAX_RD_LEN)
int ret;
- u8 buf[len];
+ u8 buf[MAX_RD_XFER_LEN];
struct i2c_msg msg[2] = {
{
.addr = priv->cfg->i2c_addr,
@@ -70,11 +77,14 @@ static int m88ds3103_rd_regs(struct m88ds3103_priv *priv,
}, {
.addr = priv->cfg->i2c_addr,
.flags = I2C_M_RD,
- .len = sizeof(buf),
+ .len = len,
.buf = buf,
}
};
+ if (WARN_ON(len > MAX_RD_LEN))
+ return -EINVAL;
+
mutex_lock(&priv->i2c_mutex);
ret = i2c_transfer(priv->i2c, msg, 2);
mutex_unlock(&priv->i2c_mutex);