Merge master.kernel.org:/home/rmk/linux-2.6-arm

[karo-tx-linux.git] / sound / pci / fm801.c

diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c
index 36b2f62e857385ace4b567b846ac31edd4b0c679..e5cfa2a0c24639cdf4354e7e2aa30771ec6a63b0 100644 (file)
--- a/sound/pci/fm801.c
+++ b/sound/pci/fm801.c
@@ -1263,7 +1263,7 @@ static int __devinit snd_fm801_create(snd_card_t * card,
        *rchip = NULL;
        if ((err = pci_enable_device(pci)) < 0)
                return err;
-       chip = kcalloc(1, sizeof(*chip), GFP_KERNEL);
+       chip = kzalloc(sizeof(*chip), GFP_KERNEL);
        if (chip == NULL) {
                pci_disable_device(pci);
                return -ENOMEM;
@@ -1462,6 +1462,7 @@ static void __devexit snd_card_fm801_remove(struct pci_dev *pci)
 
 static struct pci_driver driver = {
        .name = "FM801",
+       .owner = THIS_MODULE,
        .id_table = snd_fm801_ids,
        .probe = snd_card_fm801_probe,
        .remove = __devexit_p(snd_card_fm801_remove),