Updated from Linux LTS 3.10.21 to 3.10.22
This commit is contained in:
@@ -39,6 +39,9 @@
|
||||
*/
|
||||
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
||||
|
||||
/* Max transfer size done by I2C transfer functions */
|
||||
#define MAX_XFER_SIZE 64
|
||||
|
||||
#define NXT2002_DEFAULT_FIRMWARE "dvb-fe-nxt2002.fw"
|
||||
#define NXT2004_DEFAULT_FIRMWARE "dvb-fe-nxt2004.fw"
|
||||
#define CRC_CCIT_MASK 0x1021
|
||||
@@ -95,10 +98,16 @@ static int i2c_readbytes(struct nxt200x_state *state, u8 addr, u8 *buf, u8 len)
|
||||
static int nxt200x_writebytes (struct nxt200x_state* state, u8 reg,
|
||||
const u8 *buf, u8 len)
|
||||
{
|
||||
u8 buf2 [len+1];
|
||||
u8 buf2[MAX_XFER_SIZE];
|
||||
int err;
|
||||
struct i2c_msg msg = { .addr = state->config->demod_address, .flags = 0, .buf = buf2, .len = len + 1 };
|
||||
|
||||
if (1 + len > sizeof(buf2)) {
|
||||
pr_warn("%s: i2c wr reg=%04x: len=%d is too big!\n",
|
||||
__func__, reg, len);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
buf2[0] = reg;
|
||||
memcpy(&buf2[1], buf, len);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user