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/gl518sm.c | |
parent | ad18b0ea089928367185e13d11424aea91d4b41f (diff) | |
parent | 20731945ae743034353a88c307920d1f16cf8ac8 (diff) |
Merge branch 'master'
Diffstat (limited to 'drivers/hwmon/gl518sm.c')
-rw-r--r-- | drivers/hwmon/gl518sm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/hwmon/gl518sm.c b/drivers/hwmon/gl518sm.c index 256b9323c84b..2f178dbe3d87 100644 --- a/drivers/hwmon/gl518sm.c +++ b/drivers/hwmon/gl518sm.c | |||
@@ -365,11 +365,10 @@ static int gl518_detect(struct i2c_adapter *adapter, int address, int kind) | |||
365 | client structure, even though we cannot fill it completely yet. | 365 | client structure, even though we cannot fill it completely yet. |
366 | But it allows us to access gl518_{read,write}_value. */ | 366 | But it allows us to access gl518_{read,write}_value. */ |
367 | 367 | ||
368 | if (!(data = kmalloc(sizeof(struct gl518_data), GFP_KERNEL))) { | 368 | if (!(data = kzalloc(sizeof(struct gl518_data), GFP_KERNEL))) { |
369 | err = -ENOMEM; | 369 | err = -ENOMEM; |
370 | goto exit; | 370 | goto exit; |
371 | } | 371 | } |
372 | memset(data, 0, sizeof(struct gl518_data)); | ||
373 | 372 | ||
374 | new_client = &data->client; | 373 | new_client = &data->client; |
375 | i2c_set_clientdata(new_client, data); | 374 | i2c_set_clientdata(new_client, data); |