rt2x00: Block adhoc & master mode

[safe/jmp/linux-2.6] / drivers / hwmon / adm1026.c

diff --git a/drivers/hwmon/adm1026.c b/drivers/hwmon/adm1026.c
index b85370c..3e63c14 100644 (file)
--- a/drivers/hwmon/adm1026.c
+++ b/drivers/hwmon/adm1026.c
@@ -1221,7 +1221,7 @@ static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid_reg, NULL);
 
 static ssize_t show_vrm_reg(struct device *dev, struct device_attribute *attr, char *buf)
 {
-       struct adm1026_data *data = adm1026_update_device(dev);
+       struct adm1026_data *data = dev_get_drvdata(dev);
        return sprintf(buf,"%d\n", data->vrm);
 }
 static ssize_t store_vrm_reg(struct device *dev, struct device_attribute *attr, const char *buf,
@@ -1651,7 +1651,7 @@ static int adm1026_detect(struct i2c_adapter *adapter, int address,
                break;
        default :
                dev_err(&adapter->dev, ": Internal error, invalid "
-                       "kind (%d)!", kind);
+                       "kind (%d)!\n", kind);
                err = -EFAULT;
                goto exitfree;
        }