Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
V4L/DVB (4954): Fix: On ia64, i2c adap->inb/adap->outb are wrongly evaluated
+9
-5
drivers/media/video/usbvision/usbvision-i2c.c
+9
-5
drivers/media/video/usbvision/usbvision-i2c.c
···
50
#define PDEBUG(level, fmt, args...) \
51
if (i2c_debug & (level)) info("[%s:%d] " fmt, __PRETTY_FUNCTION__, __LINE__ , ## args)
52
53
static inline int try_write_address(struct i2c_adapter *i2c_adap,
54
unsigned char addr, int retries)
55
{
···
66
data = i2c_get_adapdata(i2c_adap);
67
buf[0] = 0x00;
68
for (i = 0; i <= retries; i++) {
69
-
ret = (adap->outb(data, addr, buf, 1));
70
if (ret == 1)
71
break; /* success! */
72
udelay(5 /*adap->udelay */ );
···
91
92
data = i2c_get_adapdata(i2c_adap);
93
for (i = 0; i <= retries; i++) {
94
-
ret = (adap->inb(data, addr, buf, 1));
95
if (ret == 1)
96
break; /* success! */
97
udelay(5 /*adap->udelay */ );
···
158
usb_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msgs[], int num)
159
{
160
struct i2c_msg *pmsg;
161
-
struct i2c_algo_usb_data *adap = i2c_adap->algo_data;
162
void *data;
163
int i, ret;
164
unsigned char addr;
···
174
175
if (pmsg->flags & I2C_M_RD) {
176
/* read bytes into buffer */
177
-
ret = (adap->inb(data, addr, pmsg->buf, pmsg->len));
178
if (ret < pmsg->len) {
179
return (ret < 0) ? ret : -EREMOTEIO;
180
}
181
} else {
182
/* write bytes from buffer */
183
-
ret = (adap->outb(data, addr, pmsg->buf, pmsg->len));
184
if (ret < pmsg->len) {
185
return (ret < 0) ? ret : -EREMOTEIO;
186
}
···
50
#define PDEBUG(level, fmt, args...) \
51
if (i2c_debug & (level)) info("[%s:%d] " fmt, __PRETTY_FUNCTION__, __LINE__ , ## args)
52
53
+
static int usbvision_i2c_write(void *data, unsigned char addr, char *buf,
54
+
short len);
55
+
static int usbvision_i2c_read(void *data, unsigned char addr, char *buf,
56
+
short len);
57
+
58
static inline int try_write_address(struct i2c_adapter *i2c_adap,
59
unsigned char addr, int retries)
60
{
···
61
data = i2c_get_adapdata(i2c_adap);
62
buf[0] = 0x00;
63
for (i = 0; i <= retries; i++) {
64
+
ret = (usbvision_i2c_write(data, addr, buf, 1));
65
if (ret == 1)
66
break; /* success! */
67
udelay(5 /*adap->udelay */ );
···
86
87
data = i2c_get_adapdata(i2c_adap);
88
for (i = 0; i <= retries; i++) {
89
+
ret = (usbvision_i2c_read(data, addr, buf, 1));
90
if (ret == 1)
91
break; /* success! */
92
udelay(5 /*adap->udelay */ );
···
153
usb_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msgs[], int num)
154
{
155
struct i2c_msg *pmsg;
156
void *data;
157
int i, ret;
158
unsigned char addr;
···
170
171
if (pmsg->flags & I2C_M_RD) {
172
/* read bytes into buffer */
173
+
ret = (usbvision_i2c_read(data, addr, pmsg->buf, pmsg->len));
174
if (ret < pmsg->len) {
175
return (ret < 0) ? ret : -EREMOTEIO;
176
}
177
} else {
178
/* write bytes from buffer */
179
+
ret = (usbvision_i2c_write(data, addr, pmsg->buf, pmsg->len));
180
if (ret < pmsg->len) {
181
return (ret < 0) ? ret : -EREMOTEIO;
182
}