summaryrefslogtreecommitdiffstats
path: root/drivers/i2c/i2c-dev.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-07-27 23:20:03 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-07-27 23:20:03 +0000
commit89eba5eb77bbf92ffed6686c951cc35f4027e71f (patch)
treeb56887b1753ca2573002bc7f60e5f3e47c33b116 /drivers/i2c/i2c-dev.c
parentf7ff3f5a67747c7714c3db772d05965a0c033705 (diff)
Merge with Linux 2.4.0-test5-pre5.
Diffstat (limited to 'drivers/i2c/i2c-dev.c')
-rw-r--r--drivers/i2c/i2c-dev.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
index 47a6292d1..cec43ae51 100644
--- a/drivers/i2c/i2c-dev.c
+++ b/drivers/i2c/i2c-dev.c
@@ -25,7 +25,7 @@
/* The I2C_RDWR ioctl code is written by Kolja Waschk <waschk@telos.de> */
-/* $Id: i2c-dev.c,v 1.30 2000/02/28 21:35:05 frodo Exp $ */
+/* $Id: i2c-dev.c,v 1.32 2000/07/25 23:52:17 frodo Exp $ */
#include <linux/kernel.h>
#include <linux/module.h>
@@ -415,6 +415,7 @@ int i2cdev_attach_adapter(struct i2c_adapter *adap)
i2cdev_adaps[i] = adap;
printk("i2c-dev.o: Registered '%s' as minor %d\n",adap->name,i);
} else {
+ /* This is actually a detach_adapter call! */
i2cdev_adaps[i] = NULL;
#ifdef DEBUG
printk("i2c-dev.o: Adapter unregistered: %s\n",adap->name);