Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[powerpc.git] / sound / pci / rme9652 / hdspm.c

diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c
index 7c67c02..60a1141 100644 (file)
--- a/sound/pci/rme9652/hdspm.c
+++ b/sound/pci/rme9652/hdspm.c
@@ -3563,8 +3563,7 @@ static int snd_hdspm_free(hdspm_t * hdspm)
                free_irq(hdspm->irq, (void *) hdspm);
 
 
-       if (hdspm->mixer)
-               kfree(hdspm->mixer);
+       kfree(hdspm->mixer);
 
        if (hdspm->iobase)
                iounmap(hdspm->iobase);
@@ -3640,6 +3639,7 @@ static void __devexit snd_hdspm_remove(struct pci_dev *pci)
 
 static struct pci_driver driver = {
        .name = "RME Hammerfall DSP MADI",
+       .owner = THIS_MODULE,
        .id_table = snd_hdspm_ids,
        .probe = snd_hdspm_probe,
        .remove = __devexit_p(snd_hdspm_remove),