diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/i2c/algos/i2c-algo-pcf.c | 2 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-elektor.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/i2c/algos/i2c-algo-pcf.c b/drivers/i2c/algos/i2c-algo-pcf.c index 1e328d19cd6d..a8a5b6d1dd88 100644 --- a/drivers/i2c/algos/i2c-algo-pcf.c +++ b/drivers/i2c/algos/i2c-algo-pcf.c | |||
@@ -135,7 +135,7 @@ static int wait_for_pin(struct i2c_algo_pcf_data *adap, int *status) { | |||
135 | *status = get_pcf(adap, 1); | 135 | *status = get_pcf(adap, 1); |
136 | #ifndef STUB_I2C | 136 | #ifndef STUB_I2C |
137 | while (timeout-- && (*status & I2C_PCF_PIN)) { | 137 | while (timeout-- && (*status & I2C_PCF_PIN)) { |
138 | adap->waitforpin(); | 138 | adap->waitforpin(adap->data); |
139 | *status = get_pcf(adap, 1); | 139 | *status = get_pcf(adap, 1); |
140 | } | 140 | } |
141 | if (*status & I2C_PCF_LAB) { | 141 | if (*status & I2C_PCF_LAB) { |
diff --git a/drivers/i2c/busses/i2c-elektor.c b/drivers/i2c/busses/i2c-elektor.c index 7f38c01fb3a0..0ed3ccb81b63 100644 --- a/drivers/i2c/busses/i2c-elektor.c +++ b/drivers/i2c/busses/i2c-elektor.c | |||
@@ -104,7 +104,8 @@ static int pcf_isa_getclock(void *data) | |||
104 | return (clock); | 104 | return (clock); |
105 | } | 105 | } |
106 | 106 | ||
107 | static void pcf_isa_waitforpin(void) { | 107 | static void pcf_isa_waitforpin(void *data) |
108 | { | ||
108 | DEFINE_WAIT(wait); | 109 | DEFINE_WAIT(wait); |
109 | int timeout = 2; | 110 | int timeout = 2; |
110 | unsigned long flags; | 111 | unsigned long flags; |