Commit 63c80f70 authored by Antti Palosaari's avatar Antti Palosaari Committed by Mauro Carvalho Chehab

[media] m88ds3103: do not use dynamic stack allocation

I2C transfer were using dynamic stack allocation. Get rid of it.
Signed-off-by: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 050ae82c
...@@ -26,17 +26,22 @@ static struct dvb_frontend_ops m88ds3103_ops; ...@@ -26,17 +26,22 @@ static struct dvb_frontend_ops m88ds3103_ops;
static int m88ds3103_wr_regs(struct m88ds3103_priv *priv, static int m88ds3103_wr_regs(struct m88ds3103_priv *priv,
u8 reg, const u8 *val, int len) u8 reg, const u8 *val, int len)
{ {
#define MAX_WR_LEN 32
#define MAX_WR_XFER_LEN (MAX_WR_LEN + 1)
int ret; int ret;
u8 buf[1 + len]; u8 buf[MAX_WR_XFER_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 = 1 + len,
.buf = buf, .buf = buf,
} }
}; };
if (WARN_ON(len > MAX_WR_LEN))
return -EINVAL;
buf[0] = reg; buf[0] = reg;
memcpy(&buf[1], val, len); memcpy(&buf[1], val, len);
...@@ -59,8 +64,10 @@ static int m88ds3103_wr_regs(struct m88ds3103_priv *priv, ...@@ -59,8 +64,10 @@ static int m88ds3103_wr_regs(struct m88ds3103_priv *priv,
static int m88ds3103_rd_regs(struct m88ds3103_priv *priv, static int m88ds3103_rd_regs(struct m88ds3103_priv *priv,
u8 reg, u8 *val, int len) u8 reg, u8 *val, int len)
{ {
#define MAX_RD_LEN 3
#define MAX_RD_XFER_LEN (MAX_RD_LEN)
int ret; int ret;
u8 buf[len]; u8 buf[MAX_RD_XFER_LEN];
struct i2c_msg msg[2] = { struct i2c_msg msg[2] = {
{ {
.addr = priv->cfg->i2c_addr, .addr = priv->cfg->i2c_addr,
...@@ -70,11 +77,14 @@ static int m88ds3103_rd_regs(struct m88ds3103_priv *priv, ...@@ -70,11 +77,14 @@ static int m88ds3103_rd_regs(struct m88ds3103_priv *priv,
}, { }, {
.addr = priv->cfg->i2c_addr, .addr = priv->cfg->i2c_addr,
.flags = I2C_M_RD, .flags = I2C_M_RD,
.len = sizeof(buf), .len = len,
.buf = buf, .buf = buf,
} }
}; };
if (WARN_ON(len > MAX_RD_LEN))
return -EINVAL;
mutex_lock(&priv->i2c_mutex); mutex_lock(&priv->i2c_mutex);
ret = i2c_transfer(priv->i2c, msg, 2); ret = i2c_transfer(priv->i2c, msg, 2);
mutex_unlock(&priv->i2c_mutex); mutex_unlock(&priv->i2c_mutex);
......
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