Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:
	arch/arm/configs/ap4evb_defconfig
	arch/arm/configs/g3evm_defconfig
	arch/arm/configs/g4evm_defconfig

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

3 files changed, 7 insertions, 12 deletions

diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index f4b21f2bb8ed..c60081169cc3 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -655,7 +655,7 @@ static void __devinit dmi_check_onboard_device(u8 type, const char *name,
                 /* & ~0x80, ignore enabled/disabled bit */
                 if ((type & ~0x80) != dmi_devices[i].type)
                         continue;
-                if (strcmp(name, dmi_devices[i].name))
+                if (strcasecmp(name, dmi_devices[i].name))
                         continue;
 
                 memset(&info, 0, sizeof(struct i2c_board_info));
@@ -704,9 +704,6 @@ static int __devinit i801_probe(struct pci_dev *dev,
 {
         unsigned char temp;
         int err, i;
-#if defined CONFIG_SENSORS_FSCHMD || defined CONFIG_SENSORS_FSCHMD_MODULE
-        const char *vendor;
-#endif
 
         I801_dev = dev;
         i801_features = 0;
@@ -808,8 +805,7 @@ static int __devinit i801_probe(struct pci_dev *dev,
         }
 #endif
 #if defined CONFIG_SENSORS_FSCHMD || defined CONFIG_SENSORS_FSCHMD_MODULE
-        vendor = dmi_get_system_info(DMI_BOARD_VENDOR);
-        if (vendor && !strcmp(vendor, "FUJITSU SIEMENS"))
+        if (dmi_name_in_vendors("FUJITSU"))
                 dmi_walk(dmi_check_onboard_devices, &i801_adapter);
 #endif
 
diff --git a/drivers/i2c/busses/i2c-sibyte.c b/drivers/i2c/busses/i2c-sibyte.c
index 3d76a188e42f..0fe505d7abe9 100644
--- a/drivers/i2c/busses/i2c-sibyte.c
+++ b/drivers/i2c/busses/i2c-sibyte.c
@@ -94,7 +94,7 @@ static int smbus_xfer(struct i2c_adapter *i2c_adap, u16 addr,
                 }
                 break;
         default:
-                return -1;      /* XXXKW better error code? */
+                return -EOPNOTSUPP;
         }
 
         while (csr_in32(SMB_CSR(adap, R_SMB_STATUS)) & M_SMB_BUSY)
@@ -104,7 +104,7 @@ static int smbus_xfer(struct i2c_adapter *i2c_adap, u16 addr,
         if (error & M_SMB_ERROR) {
                 /* Clear error bit by writing a 1 */
                 csr_out32(M_SMB_ERROR, SMB_CSR(adap, R_SMB_STATUS));
-                return -1;      /* XXXKW better error code? */
+                return (error & M_SMB_ERROR_TYPE) ? -EIO : -ENXIO;
         }
 
         if (data_bytes == 1)
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 1cca2631e5b3..0815e10da7c6 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -1428,13 +1428,12 @@ static int i2c_detect(struct i2c_adapter *adapter, struct i2c_driver *driver)
         if (!(adapter->class & driver->class))
                 goto exit_free;
 
-        /* Stop here if we can't use SMBUS_QUICK */
-        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_QUICK)) {
+        /* Stop here if the bus doesn't support probing */
+        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_READ_BYTE)) {
                 if (address_list[0] == I2C_CLIENT_END)
                         goto exit_free;
 
-                dev_warn(&adapter->dev, "SMBus Quick command not supported, "
-                         "can't probe for chips\n");
+                dev_warn(&adapter->dev, "Probing not supported\n");
                 err = -EOPNOTSUPP;
                 goto exit_free;
         }