Pull dock into release branch

[linux-2.6] / sound / oss / dmasound / tas3004.c

diff --git a/sound/oss/dmasound/tas3004.c b/sound/oss/dmasound/tas3004.c
index af34fb39bc29ed2323572097dd8c8d99cd778502..678bf0ff6da27329ad0951b9b2bf2ae7bb7714c9 100644 (file)
--- a/sound/oss/dmasound/tas3004.c
+++ b/sound/oss/dmasound/tas3004.c
@@ -1092,10 +1092,9 @@ tas3004_init(struct i2c_client *client)
        char mcr2 = 0;
        int i, j;
 
-       self = kmalloc(sz, GFP_KERNEL);
+       self = kzalloc(sz, GFP_KERNEL);
        if (!self)
                return -ENOMEM;
-       memset(self, 0, sz);
 
        self->super.client = client;
        self->super.shadow = (tas_shadow_t *)(self+1);