git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'tracing/ftrace' into auto-ftrace-next
[pandora-kernel.git]
/
drivers
/
i2c
/
busses
/
i2c-i810.c
diff --git
a/drivers/i2c/busses/i2c-i810.c
b/drivers/i2c/busses/i2c-i810.c
index
b66fb6b
..
42e8d94
100644
(file)
--- a/
drivers/i2c/busses/i2c-i810.c
+++ b/
drivers/i2c/busses/i2c-i810.c
@@
-171,6
+171,7
@@
static struct i2c_algo_bit_data i810_i2c_bit_data = {
static struct i2c_adapter i810_i2c_adapter = {
.owner = THIS_MODULE,
static struct i2c_adapter i810_i2c_adapter = {
.owner = THIS_MODULE,
+ .id = I2C_HW_B_I810,
.name = "I810/I815 I2C Adapter",
.algo_data = &i810_i2c_bit_data,
};
.name = "I810/I815 I2C Adapter",
.algo_data = &i810_i2c_bit_data,
};
@@
-186,6
+187,7
@@
static struct i2c_algo_bit_data i810_ddc_bit_data = {
static struct i2c_adapter i810_ddc_adapter = {
.owner = THIS_MODULE,
static struct i2c_adapter i810_ddc_adapter = {
.owner = THIS_MODULE,
+ .id = I2C_HW_B_I810,
.name = "I810/I815 DDC Adapter",
.algo_data = &i810_ddc_bit_data,
};
.name = "I810/I815 DDC Adapter",
.algo_data = &i810_ddc_bit_data,
};
@@
-219,14
+221,14
@@
static int __devinit i810_probe(struct pci_dev *dev, const struct pci_device_id
return retval;
retval = i2c_bit_add_bus(&i810_ddc_adapter);
if (retval)
return retval;
retval = i2c_bit_add_bus(&i810_ddc_adapter);
if (retval)
- i2c_
bit_del_bus
(&i810_i2c_adapter);
+ i2c_
del_adapter
(&i810_i2c_adapter);
return retval;
}
static void __devexit i810_remove(struct pci_dev *dev)
{
return retval;
}
static void __devexit i810_remove(struct pci_dev *dev)
{
- i2c_
bit_del_bus
(&i810_ddc_adapter);
- i2c_
bit_del_bus
(&i810_i2c_adapter);
+ i2c_
del_adapter
(&i810_ddc_adapter);
+ i2c_
del_adapter
(&i810_i2c_adapter);
iounmap(ioaddr);
}
iounmap(ioaddr);
}