diff options
| author | Mariusz Kozlowski <m.kozlowski@tuxland.pl> | 2007-07-31 23:04:19 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2007-07-31 23:04:19 +0200 |
| commit | 916e89fdd1b21eec4abbc9e228757db77660fff2 (patch) | |
| tree | dfbf049f85144b5a973f099a0e390cffed936ca7 /drivers/sbus/char | |
| parent | [SPARC]: Fix exec failures on sun4c. (diff) | |
| download | linux-916e89fdd1b21eec4abbc9e228757db77660fff2.tar.xz linux-916e89fdd1b21eec4abbc9e228757db77660fff2.zip | |
[BBC_ENVCTRL]: kmalloc + memset conversion to kzalloc
Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/sbus/char')
| -rw-r--r-- | drivers/sbus/char/bbc_envctrl.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/sbus/char/bbc_envctrl.c b/drivers/sbus/char/bbc_envctrl.c index e821a155b658..0bde26989a23 100644 --- a/drivers/sbus/char/bbc_envctrl.c +++ b/drivers/sbus/char/bbc_envctrl.c @@ -479,11 +479,12 @@ static int kenvctrld(void *__unused) static void attach_one_temp(struct linux_ebus_child *echild, int temp_idx) { - struct bbc_cpu_temperature *tp = kmalloc(sizeof(*tp), GFP_KERNEL); + struct bbc_cpu_temperature *tp; + tp = kzalloc(sizeof(*tp), GFP_KERNEL); if (!tp) return; - memset(tp, 0, sizeof(*tp)); + tp->client = bbc_i2c_attach(echild); if (!tp->client) { kfree(tp); @@ -525,11 +526,12 @@ static void attach_one_temp(struct linux_ebus_child *echild, int temp_idx) static void attach_one_fan(struct linux_ebus_child *echild, int fan_idx) { - struct bbc_fan_control *fp = kmalloc(sizeof(*fp), GFP_KERNEL); + struct bbc_fan_control *fp; + fp = kzalloc(sizeof(*fp), GFP_KERNEL); if (!fp) return; - memset(fp, 0, sizeof(*fp)); + fp->client = bbc_i2c_attach(echild); if (!fp->client) { kfree(fp); |