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/fscher.c | |
parent | 7a9f8f93d2dad38f30fbc79d8a1e6517373aa4b6 (diff) | |
parent | 9dfb7808fb05643b0d06df7411b94d9546696bf1 (diff) |
Merge branch 'upstream'
Diffstat (limited to 'drivers/hwmon/fscher.c')
-rw-r--r-- | drivers/hwmon/fscher.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/hwmon/fscher.c b/drivers/hwmon/fscher.c index eef6061d786b..a02e1c34c757 100644 --- a/drivers/hwmon/fscher.c +++ b/drivers/hwmon/fscher.c | |||
@@ -303,11 +303,10 @@ static int fscher_detect(struct i2c_adapter *adapter, int address, int kind) | |||
303 | /* OK. For now, we presume we have a valid client. We now create the | 303 | /* OK. For now, we presume we have a valid client. We now create the |
304 | * client structure, even though we cannot fill it completely yet. | 304 | * client structure, even though we cannot fill it completely yet. |
305 | * But it allows us to access i2c_smbus_read_byte_data. */ | 305 | * But it allows us to access i2c_smbus_read_byte_data. */ |
306 | if (!(data = kmalloc(sizeof(struct fscher_data), GFP_KERNEL))) { | 306 | if (!(data = kzalloc(sizeof(struct fscher_data), GFP_KERNEL))) { |
307 | err = -ENOMEM; | 307 | err = -ENOMEM; |
308 | goto exit; | 308 | goto exit; |
309 | } | 309 | } |
310 | memset(data, 0, sizeof(struct fscher_data)); | ||
311 | 310 | ||
312 | /* The common I2C client data is placed right before the | 311 | /* The common I2C client data is placed right before the |
313 | * Hermes-specific data. */ | 312 | * Hermes-specific data. */ |