Merge rsync://bughost.org/repos/ieee80211-delta/

[linux-2.6-omap-h63xx.git] / drivers / hwmon / adm1031.c

diff --git a/drivers/hwmon/adm1031.c b/drivers/hwmon/adm1031.c
index 58338ed7c8a1c676095e3c9672fa08e453455a7b..7c545d5eee4570f0cbe9c4e175db925db36344bd 100644 (file)
--- a/drivers/hwmon/adm1031.c
+++ b/drivers/hwmon/adm1031.c
@@ -740,11 +740,10 @@ static int adm1031_detect(struct i2c_adapter *adapter, int address, int kind)
        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
                goto exit;
 
-       if (!(data = kmalloc(sizeof(struct adm1031_data), GFP_KERNEL))) {
+       if (!(data = kzalloc(sizeof(struct adm1031_data), GFP_KERNEL))) {
                err = -ENOMEM;
                goto exit;
        }
-       memset(data, 0, sizeof(struct adm1031_data));
 
        new_client = &data->client;
        i2c_set_clientdata(new_client, data);