[ALSA] Remove obsolete chip_t

[linux-3.10.git] / sound / mips / au1x00.c

diff --git a/sound/mips/au1x00.c b/sound/mips/au1x00.c
index c20522b0213463409a92f750c50940944081e19a..2df78a64c7f20ccb0d1fab1784e00f6bf1aa162a 100644 (file)
--- a/sound/mips/au1x00.c
+++ b/sound/mips/au1x00.c
@@ -57,8 +57,6 @@ MODULE_CLASSES("{sound}");
 MODULE_DEVICES("{{AMD,Au1000 AC'97}}");
 #endif
 
-#define chip_t au1000_t
-
 #define PLAYBACK 0
 #define CAPTURE 1
 #define AC97_SLOT_3 0x01
@@ -606,8 +604,7 @@ snd_au1000_free(snd_card_t *card)
                /* put internal AC97 block into reset */
                au1000->ac97_ioport->cntrl = AC97C_RS;
                au1000->ac97_ioport = NULL;
-               release_resource(au1000->ac97_res_port);
-               kfree_nocheck(au1000->ac97_res_port);
+               release_and_free_resource(au1000->ac97_res_port);
        }
 
        if (au1000->stream[PLAYBACK]->dma >= 0)
@@ -667,6 +664,11 @@ au1000_init(void)
        strcpy(au1000->card->shortname, "Au1000-AC97");
        sprintf(au1000->card->longname, "AMD Au1000--AC97 ALSA Driver");
 
+       if ((err = snd_card_set_generic_dev(au1000->card)) < 0) {
+               snd_card_free(au1000->card);
+               return err;
+       }
+
        if ((err = snd_card_register(au1000->card)) < 0) {
                snd_card_free(au1000->card);
                return err;