Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block

[mv-sheeva.git] / sound / oss / ad1889.c

diff --git a/sound/oss/ad1889.c b/sound/oss/ad1889.c
index f0724327493c0c47e66a822e009ee0602c064a9b..c0730a3563a2962ab86a4c24ec39c063c4df0de4 100644 (file)
--- a/sound/oss/ad1889.c
+++ b/sound/oss/ad1889.c
@@ -230,9 +230,8 @@ static ad1889_dev_t *ad1889_alloc_dev(struct pci_dev *pci)
        struct dmabuf *dmabuf;
        int i;
 
-       if ((dev = kmalloc(sizeof(ad1889_dev_t), GFP_KERNEL)) == NULL) 
+       if ((dev = kzalloc(sizeof(ad1889_dev_t), GFP_KERNEL)) == NULL)
                return NULL;
-       memset(dev, 0, sizeof(ad1889_dev_t));
        spin_lock_init(&dev->lock);
        dev->pci = pci;