Updated from Linux LTS 3.10.21 to 3.10.22
This commit is contained in:
@@ -21,6 +21,9 @@
|
||||
|
||||
#include "af9035.h"
|
||||
|
||||
/* Max transfer size done by I2C transfer functions */
|
||||
#define MAX_XFER_SIZE 64
|
||||
|
||||
DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
|
||||
|
||||
static u16 af9035_checksum(const u8 *buf, size_t len)
|
||||
@@ -125,10 +128,16 @@ exit:
|
||||
/* write multiple registers */
|
||||
static int af9035_wr_regs(struct dvb_usb_device *d, u32 reg, u8 *val, int len)
|
||||
{
|
||||
u8 wbuf[6 + len];
|
||||
u8 wbuf[MAX_XFER_SIZE];
|
||||
u8 mbox = (reg >> 16) & 0xff;
|
||||
struct usb_req req = { CMD_MEM_WR, mbox, sizeof(wbuf), wbuf, 0, NULL };
|
||||
|
||||
if (6 + len > sizeof(wbuf)) {
|
||||
dev_warn(&d->udev->dev, "%s: i2c wr: len=%d is too big!\n",
|
||||
KBUILD_MODNAME, len);
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
||||
wbuf[0] = len;
|
||||
wbuf[1] = 2;
|
||||
wbuf[2] = 0;
|
||||
@@ -227,9 +236,16 @@ static int af9035_i2c_master_xfer(struct i2c_adapter *adap,
|
||||
msg[1].len);
|
||||
} else {
|
||||
/* I2C */
|
||||
u8 buf[5 + msg[0].len];
|
||||
u8 buf[MAX_XFER_SIZE];
|
||||
struct usb_req req = { CMD_I2C_RD, 0, sizeof(buf),
|
||||
buf, msg[1].len, msg[1].buf };
|
||||
|
||||
if (5 + msg[0].len > sizeof(buf)) {
|
||||
dev_warn(&d->udev->dev,
|
||||
"%s: i2c xfer: len=%d is too big!\n",
|
||||
KBUILD_MODNAME, msg[0].len);
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
req.mbox |= ((msg[0].addr & 0x80) >> 3);
|
||||
buf[0] = msg[1].len;
|
||||
buf[1] = msg[0].addr << 1;
|
||||
@@ -256,9 +272,16 @@ static int af9035_i2c_master_xfer(struct i2c_adapter *adap,
|
||||
msg[0].len - 3);
|
||||
} else {
|
||||
/* I2C */
|
||||
u8 buf[5 + msg[0].len];
|
||||
u8 buf[MAX_XFER_SIZE];
|
||||
struct usb_req req = { CMD_I2C_WR, 0, sizeof(buf), buf,
|
||||
0, NULL };
|
||||
|
||||
if (5 + msg[0].len > sizeof(buf)) {
|
||||
dev_warn(&d->udev->dev,
|
||||
"%s: i2c xfer: len=%d is too big!\n",
|
||||
KBUILD_MODNAME, msg[0].len);
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
req.mbox |= ((msg[0].addr & 0x80) >> 3);
|
||||
buf[0] = msg[0].len;
|
||||
buf[1] = msg[0].addr << 1;
|
||||
|
||||
Reference in New Issue
Block a user