git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
drivers
/
i2c
/
busses
/
i2c-powermac.c
diff --git
a/drivers/i2c/busses/i2c-powermac.c
b/drivers/i2c/busses/i2c-powermac.c
index
53bb435
..
df786eb
100644
(file)
--- a/
drivers/i2c/busses/i2c-powermac.c
+++ b/
drivers/i2c/busses/i2c-powermac.c
@@
-20,6
+20,7
@@
*/
*/
+#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/types.h>
@@
-148,6
+149,8
@@
static int i2c_powermac_master_xfer( struct i2c_adapter *adap,
int read;
int addrdir;
int read;
int addrdir;
+ if (num != 1)
+ return -EINVAL;
if (msgs->flags & I2C_M_TEN)
return -EINVAL;
read = (msgs->flags & I2C_M_RD) != 0;
if (msgs->flags & I2C_M_TEN)
return -EINVAL;
read = (msgs->flags & I2C_M_RD) != 0;
@@
-164,7
+167,7
@@
static int i2c_powermac_master_xfer( struct i2c_adapter *adap,
rc = pmac_i2c_xfer(bus, addrdir, 0, 0, msgs->buf, msgs->len);
bail:
pmac_i2c_close(bus);
rc = pmac_i2c_xfer(bus, addrdir, 0, 0, msgs->buf, msgs->len);
bail:
pmac_i2c_close(bus);
- return rc < 0 ? rc :
1
;
+ return rc < 0 ? rc :
msgs->len
;
}
static u32 i2c_powermac_func(struct i2c_adapter * adapter)
}
static u32 i2c_powermac_func(struct i2c_adapter * adapter)