vserver 2.0 rc7

[linux-2.6.git] / drivers / i2c / busses / i2c-keywest.c

diff --git a/drivers/i2c/busses/i2c-keywest.c b/drivers/i2c/busses/i2c-keywest.c
index bc94b8c..867d443 100644 (file)
--- a/drivers/i2c/busses/i2c-keywest.c
+++ b/drivers/i2c/busses/i2c-keywest.c
@@ -399,7 +399,7 @@ keywest_smbus_xfer( struct i2c_adapter*     adap,
  */
 static int
 keywest_xfer(  struct i2c_adapter *adap,
-               struct i2c_msg msgs[], 
+               struct i2c_msg *msgs, 
                int num)
 {
        struct keywest_chan* chan = i2c_get_adapdata(adap);
@@ -516,6 +516,11 @@ create_iface(struct device_node *np, struct device *dev)
        u32 *psteps, *prate;
        int rc;
 
+       if (np->n_intrs < 1 || np->n_addrs < 1) {
+               printk(KERN_ERR "%s: Missing interrupt or address !\n",
+                      np->full_name);
+               return -ENODEV;
+       }
        if (pmac_low_i2c_lock(np))
                return -ENODEV;