diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 21:32:01 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 21:32:01 -0400 |
commit | 5615ca7906aefbdc3318604c89db5931d0a25910 (patch) | |
tree | c34bcc7e314f49005ad88ac84c908128729c0329 /drivers/hwmon/lm63.c | |
parent | 7a9f8f93d2dad38f30fbc79d8a1e6517373aa4b6 (diff) | |
parent | 9dfb7808fb05643b0d06df7411b94d9546696bf1 (diff) |
Merge branch 'upstream'
Diffstat (limited to 'drivers/hwmon/lm63.c')
-rw-r--r-- | drivers/hwmon/lm63.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/hwmon/lm63.c b/drivers/hwmon/lm63.c index be5c7095ecbb..954ec2497249 100644 --- a/drivers/hwmon/lm63.c +++ b/drivers/hwmon/lm63.c | |||
@@ -375,11 +375,10 @@ static int lm63_detect(struct i2c_adapter *adapter, int address, int kind) | |||
375 | if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) | 375 | if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) |
376 | goto exit; | 376 | goto exit; |
377 | 377 | ||
378 | if (!(data = kmalloc(sizeof(struct lm63_data), GFP_KERNEL))) { | 378 | if (!(data = kzalloc(sizeof(struct lm63_data), GFP_KERNEL))) { |
379 | err = -ENOMEM; | 379 | err = -ENOMEM; |
380 | goto exit; | 380 | goto exit; |
381 | } | 381 | } |
382 | memset(data, 0, sizeof(struct lm63_data)); | ||
383 | 382 | ||
384 | /* The common I2C client data is placed right before the | 383 | /* The common I2C client data is placed right before the |
385 | LM63-specific data. */ | 384 | LM63-specific data. */ |