Merge branch 'master' into csb1725

[mv-sheeva.git] / sound / drivers / virmidi.c

diff --git a/sound/drivers/virmidi.c b/sound/drivers/virmidi.c
index 0e631c3221e3b72f46b2b1b11569d5931ead1097..f4cd49336f336866e36b6814206fdaf0ff9da226 100644 (file)
--- a/sound/drivers/virmidi.c
+++ b/sound/drivers/virmidi.c
@@ -94,7 +94,7 @@ static int __devinit snd_virmidi_probe(struct platform_device *devptr)
                              sizeof(struct snd_card_virmidi), &card);
        if (err < 0)
                return err;
-       vmidi = (struct snd_card_virmidi *)card->private_data;
+       vmidi = card->private_data;
        vmidi->card = card;
 
        if (midi_devs[dev] > MAX_MIDI_DEVICES) {