Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[karo-tx-linux.git] / sound / isa / gus / gusmax.c

diff --git a/sound/isa/gus/gusmax.c b/sound/isa/gus/gusmax.c
index f26eac8d8110093aed72bfc51dce0340ca972ee9..3e4a58b72913d613e719a9ccc912d0bf75661a0d 100644 (file)
--- a/sound/isa/gus/gusmax.c
+++ b/sound/isa/gus/gusmax.c
@@ -191,7 +191,7 @@ static int __devinit snd_gusmax_mixer(struct snd_wss *chip)
 
 static void snd_gusmax_free(struct snd_card *card)
 {
-       struct snd_gusmax *maxcard = (struct snd_gusmax *)card->private_data;
+       struct snd_gusmax *maxcard = card->private_data;
        
        if (maxcard == NULL)
                return;
@@ -219,7 +219,7 @@ static int __devinit snd_gusmax_probe(struct device *pdev, unsigned int dev)
        if (err < 0)
                return err;
        card->private_free = snd_gusmax_free;
-       maxcard = (struct snd_gusmax *)card->private_data;
+       maxcard = card->private_data;
        maxcard->card = card;
        maxcard->irq = -1;