ocfs2: Unlock mutex in local alloc failure case

[linux-2.6] / sound / isa / cmi8330.c

diff --git a/sound/isa/cmi8330.c b/sound/isa/cmi8330.c
index 456156de0791054e7d016545b9fee7abe23641bd..f471f8ad68852d1dbbe09b684668be39a8511cbd 100644 (file)
--- a/sound/isa/cmi8330.c
+++ b/sound/isa/cmi8330.c
@@ -109,6 +109,7 @@ module_param_array(wssdma, int, NULL, 0444);
 MODULE_PARM_DESC(wssdma, "DMA for CMI8330 WSS driver.");
 
 #ifdef CONFIG_PNP
+static int isa_registered;
 static int pnp_registered;
 #endif
 
@@ -601,7 +602,7 @@ static int snd_cmi8330_isa_resume(struct device *dev, unsigned int n)
 }
 #endif
 
-#define CMI8330_DRIVER "snd_cmi8330"
+#define DEV_NAME       "cmi8330"
 
 static struct isa_driver snd_cmi8330_driver = {
        .match          = snd_cmi8330_isa_match,
@@ -612,7 +613,7 @@ static struct isa_driver snd_cmi8330_driver = {
        .resume         = snd_cmi8330_isa_resume,
 #endif
        .driver         = {
-               .name   = CMI8330_DRIVER
+               .name   = DEV_NAME
        },
 };
 
@@ -686,14 +687,18 @@ static int __init alsa_card_cmi8330_init(void)
        int err;
 
        err = isa_register_driver(&snd_cmi8330_driver, SNDRV_CARDS);
-       if (err < 0)
-               return err;
 #ifdef CONFIG_PNP
+       if (!err)
+               isa_registered = 1;
+
        err = pnp_register_card_driver(&cmi8330_pnpc_driver);
        if (!err)
                pnp_registered = 1;
+
+       if (isa_registered)
+               err = 0;
 #endif
-       return 0;
+       return err;
 }
 
 static void __exit alsa_card_cmi8330_exit(void)
@@ -701,8 +706,10 @@ static void __exit alsa_card_cmi8330_exit(void)
 #ifdef CONFIG_PNP
        if (pnp_registered)
                pnp_unregister_card_driver(&cmi8330_pnpc_driver);
+
+       if (isa_registered)
 #endif
-       isa_unregister_driver(&snd_cmi8330_driver);
+               isa_unregister_driver(&snd_cmi8330_driver);
 }
 
 module_init(alsa_card_cmi8330_init)