summaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@hera.kernel.org>2005-05-27 01:16:24 -0700
committerChristoph Hellwig <hch@melbourne.sgi.com>2005-05-27 01:16:24 -0700
commitb19312c4c8f3f84da57bba01d45549df1cf10dcd (patch)
tree1c34ce89be6b4e257bc03026d0268deb17727044 /drivers/i2c
parentd3870398fafd4911bd84573b78be4b6b762f32b0 (diff)
parent4ec5240ec367a592834385893200dd4fb369354c (diff)
downloadtalos-obmc-linux-b19312c4c8f3f84da57bba01d45549df1cf10dcd.tar.gz
talos-obmc-linux-b19312c4c8f3f84da57bba01d45549df1cf10dcd.zip
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/busses/i2c-keywest.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/i2c/busses/i2c-keywest.c b/drivers/i2c/busses/i2c-keywest.c
index dd0d4c463146..867d443e7133 100644
--- a/drivers/i2c/busses/i2c-keywest.c
+++ b/drivers/i2c/busses/i2c-keywest.c
@@ -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;
OpenPOWER on IntegriCloud