diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /sound/drivers/virmidi.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'sound/drivers/virmidi.c')
| -rw-r--r-- | sound/drivers/virmidi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/drivers/virmidi.c b/sound/drivers/virmidi.c index 0e631c3221e3..f4cd49336f33 100644 --- a/sound/drivers/virmidi.c +++ b/sound/drivers/virmidi.c | |||
| @@ -94,7 +94,7 @@ static int __devinit snd_virmidi_probe(struct platform_device *devptr) | |||
| 94 | sizeof(struct snd_card_virmidi), &card); | 94 | sizeof(struct snd_card_virmidi), &card); |
| 95 | if (err < 0) | 95 | if (err < 0) |
| 96 | return err; | 96 | return err; |
| 97 | vmidi = (struct snd_card_virmidi *)card->private_data; | 97 | vmidi = card->private_data; |
| 98 | vmidi->card = card; | 98 | vmidi->card = card; |
| 99 | 99 | ||
| 100 | if (midi_devs[dev] > MAX_MIDI_DEVICES) { | 100 | if (midi_devs[dev] > MAX_MIDI_DEVICES) { |