diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 18:48:57 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 18:48:57 -0400 |
commit | 596c96ba06e5d56e72451e02f93f4e15e17458df (patch) | |
tree | 78bc640acacb8faeb621c51296e99dbb0533a147 /drivers/hwmon/lm83.c | |
parent | ad18b0ea089928367185e13d11424aea91d4b41f (diff) | |
parent | 20731945ae743034353a88c307920d1f16cf8ac8 (diff) |
Merge branch 'master'
Diffstat (limited to 'drivers/hwmon/lm83.c')
-rw-r--r-- | drivers/hwmon/lm83.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/hwmon/lm83.c b/drivers/hwmon/lm83.c index d74b2c20c719..9a70611a9f69 100644 --- a/drivers/hwmon/lm83.c +++ b/drivers/hwmon/lm83.c | |||
@@ -230,11 +230,10 @@ static int lm83_detect(struct i2c_adapter *adapter, int address, int kind) | |||
230 | if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) | 230 | if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) |
231 | goto exit; | 231 | goto exit; |
232 | 232 | ||
233 | if (!(data = kmalloc(sizeof(struct lm83_data), GFP_KERNEL))) { | 233 | if (!(data = kzalloc(sizeof(struct lm83_data), GFP_KERNEL))) { |
234 | err = -ENOMEM; | 234 | err = -ENOMEM; |
235 | goto exit; | 235 | goto exit; |
236 | } | 236 | } |
237 | memset(data, 0, sizeof(struct lm83_data)); | ||
238 | 237 | ||
239 | /* The common I2C client data is placed right after the | 238 | /* The common I2C client data is placed right after the |
240 | * LM83-specific data. */ | 239 | * LM83-specific data. */ |