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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
i2c
/
busses
/
i2c-parport-light.c
diff --git
a/drivers/i2c/busses/i2c-parport-light.c
b/drivers/i2c/busses/i2c-parport-light.c
index
c63025a
..
4bc4281
100644
(file)
--- a/
drivers/i2c/busses/i2c-parport-light.c
+++ b/
drivers/i2c/busses/i2c-parport-light.c
@@
-103,7
+103,6
@@
static struct i2c_algo_bit_data parport_algo_data = {
.getsda = parport_getsda,
.getscl = parport_getscl,
.udelay = 50,
.getsda = parport_getsda,
.getscl = parport_getscl,
.udelay = 50,
- .mdelay = 50,
.timeout = HZ,
};
.timeout = HZ,
};
@@
-121,9
+120,14
@@
static struct i2c_adapter parport_adapter = {
static int __init i2c_parport_init(void)
{
static int __init i2c_parport_init(void)
{
- if (type < 0 || type >= ARRAY_SIZE(adapter_parm)) {
+ if (type < 0) {
+ printk(KERN_WARNING "i2c-parport: adapter type unspecified\n");
+ return -ENODEV;
+ }
+
+ if (type >= ARRAY_SIZE(adapter_parm)) {
printk(KERN_WARNING "i2c-parport: invalid type (%d)\n", type);
printk(KERN_WARNING "i2c-parport: invalid type (%d)\n", type);
-
type = 0
;
+
return -ENODEV
;
}
if (base == 0) {
}
if (base == 0) {
@@
-159,7
+163,7
@@
static void __exit i2c_parport_exit(void)
if (adapter_parm[type].init.val)
line_set(0, &adapter_parm[type].init);
if (adapter_parm[type].init.val)
line_set(0, &adapter_parm[type].init);
- i2c_
bit_del_bus
(&parport_adapter);
+ i2c_
del_adapter
(&parport_adapter);
release_region(base, 3);
}
release_region(base, 3);
}