Merge tag 'tags/mute-led-rework' into for-next

[linux-block.git] / sound / pci / rme9652 / rme9652.c

diff --git a/sound/pci/rme9652/rme9652.c b/sound/pci/rme9652/rme9652.c
index 012fbec5e6a74d39fcb882c8a6db2052d57ea81b..7a4d395abceeb1902e9b2e2d9a9c13a7b1f3335d 100644 (file)
--- a/sound/pci/rme9652/rme9652.c
+++ b/sound/pci/rme9652/rme9652.c
@@ -39,8 +39,6 @@ MODULE_PARM_DESC(precise_ptr, "Enable precise pointer (doesn't work reliably).")
 MODULE_AUTHOR("Paul Davis <pbd@op.net>, Winfried Ritsch");
 MODULE_DESCRIPTION("RME Digi9652/Digi9636");
 MODULE_LICENSE("GPL");
-MODULE_SUPPORTED_DEVICE("{{RME,Hammerfall},"
-               "{RME,Hammerfall-Light}}");
 
 /* The Hammerfall has two sets of 24 ADAT + 2 S/PDIF channels, one for
    capture, one for playback. Both the ADAT and S/PDIF channels appear
@@ -1733,7 +1731,8 @@ static int snd_rme9652_free(struct snd_rme9652 *rme9652)
        if (rme9652->port)
                pci_release_regions(rme9652->pci);
 
-       pci_disable_device(rme9652->pci);
+       if (pci_is_enabled(rme9652->pci))
+               pci_disable_device(rme9652->pci);
        return 0;
 }