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 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee13...
[pandora-kernel.git]
/
drivers
/
i2c
/
busses
/
i2c-i801.c
diff --git
a/drivers/i2c/busses/i2c-i801.c
b/drivers/i2c/busses/i2c-i801.c
index
3e0d04d
..
bbb2fbe
100644
(file)
--- a/
drivers/i2c/busses/i2c-i801.c
+++ b/
drivers/i2c/busses/i2c-i801.c
@@
-434,7
+434,7
@@
static u32 i801_func(struct i2c_adapter *adapter)
| (isich4 ? I2C_FUNC_SMBUS_HWPEC_CALC : 0);
}
| (isich4 ? I2C_FUNC_SMBUS_HWPEC_CALC : 0);
}
-static struct i2c_algorithm smbus_algorithm = {
+static
const
struct i2c_algorithm smbus_algorithm = {
.smbus_xfer = i801_access,
.functionality = i801_func,
};
.smbus_xfer = i801_access,
.functionality = i801_func,
};
@@
-488,15
+488,15
@@
static int __devinit i801_probe(struct pci_dev *dev, const struct pci_device_id
dev_err(&dev->dev, "SMBus base address uninitialized, "
"upgrade BIOS\n");
err = -ENODEV;
dev_err(&dev->dev, "SMBus base address uninitialized, "
"upgrade BIOS\n");
err = -ENODEV;
- goto exit
_disable
;
+ goto exit;
}
err = pci_request_region(dev, SMBBAR, i801_driver.name);
if (err) {
dev_err(&dev->dev, "Failed to request SMBus region "
}
err = pci_request_region(dev, SMBBAR, i801_driver.name);
if (err) {
dev_err(&dev->dev, "Failed to request SMBus region "
- "0x%lx-0x%
l
x\n", i801_smba,
- pci_resource_end(dev, SMBBAR));
- goto exit
_disable
;
+ "0x%lx-0x%
L
x\n", i801_smba,
+
(unsigned long long)
pci_resource_end(dev, SMBBAR));
+ goto exit;
}
pci_read_config_byte(I801_dev, SMBHSTCFG, &temp);
}
pci_read_config_byte(I801_dev, SMBHSTCFG, &temp);
@@
-520,11
+520,12
@@
static int __devinit i801_probe(struct pci_dev *dev, const struct pci_device_id
err = i2c_add_adapter(&i801_adapter);
if (err) {
dev_err(&dev->dev, "Failed to add SMBus adapter\n");
err = i2c_add_adapter(&i801_adapter);
if (err) {
dev_err(&dev->dev, "Failed to add SMBus adapter\n");
- goto exit_
disabl
e;
+ goto exit_
releas
e;
}
}
+ return 0;
-exit_
disabl
e:
- pci_
disable_device(dev
);
+exit_
releas
e:
+ pci_
release_region(dev, SMBBAR
);
exit:
return err;
}
exit:
return err;
}
@@
-533,7
+534,10
@@
static void __devexit i801_remove(struct pci_dev *dev)
{
i2c_del_adapter(&i801_adapter);
pci_release_region(dev, SMBBAR);
{
i2c_del_adapter(&i801_adapter);
pci_release_region(dev, SMBBAR);
- pci_disable_device(dev);
+ /*
+ * do not call pci_disable_device(dev) since it can cause hard hangs on
+ * some systems during power-off (eg. Fujitsu-Siemens Lifebook E8010)
+ */
}
static struct pci_driver i801_driver = {
}
static struct pci_driver i801_driver = {