diff options
-rw-r--r-- | sound/pci/riptide/riptide.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c index 9408b1eeec40..979f7da641ce 100644 --- a/sound/pci/riptide/riptide.c +++ b/sound/pci/riptide/riptide.c | |||
@@ -1630,14 +1630,14 @@ static int snd_riptide_playback_open(struct snd_pcm_substream *substream) | |||
1630 | struct snd_riptide *chip = snd_pcm_substream_chip(substream); | 1630 | struct snd_riptide *chip = snd_pcm_substream_chip(substream); |
1631 | struct snd_pcm_runtime *runtime = substream->runtime; | 1631 | struct snd_pcm_runtime *runtime = substream->runtime; |
1632 | struct pcmhw *data; | 1632 | struct pcmhw *data; |
1633 | int index = substream->number; | 1633 | int sub_num = substream->number; |
1634 | 1634 | ||
1635 | chip->playback_substream[index] = substream; | 1635 | chip->playback_substream[sub_num] = substream; |
1636 | runtime->hw = snd_riptide_playback; | 1636 | runtime->hw = snd_riptide_playback; |
1637 | data = kzalloc(sizeof(struct pcmhw), GFP_KERNEL); | 1637 | data = kzalloc(sizeof(struct pcmhw), GFP_KERNEL); |
1638 | data->paths = lbus_play_paths[index]; | 1638 | data->paths = lbus_play_paths[sub_num]; |
1639 | data->id = play_ids[index]; | 1639 | data->id = play_ids[sub_num]; |
1640 | data->source = play_sources[index]; | 1640 | data->source = play_sources[sub_num]; |
1641 | data->intdec[0] = 0xff; | 1641 | data->intdec[0] = 0xff; |
1642 | data->intdec[1] = 0xff; | 1642 | data->intdec[1] = 0xff; |
1643 | data->state = ST_STOP; | 1643 | data->state = ST_STOP; |
@@ -1670,10 +1670,10 @@ static int snd_riptide_playback_close(struct snd_pcm_substream *substream) | |||
1670 | { | 1670 | { |
1671 | struct snd_riptide *chip = snd_pcm_substream_chip(substream); | 1671 | struct snd_riptide *chip = snd_pcm_substream_chip(substream); |
1672 | struct pcmhw *data = get_pcmhwdev(substream); | 1672 | struct pcmhw *data = get_pcmhwdev(substream); |
1673 | int index = substream->number; | 1673 | int sub_num = substream->number; |
1674 | 1674 | ||
1675 | substream->runtime->private_data = NULL; | 1675 | substream->runtime->private_data = NULL; |
1676 | chip->playback_substream[index] = NULL; | 1676 | chip->playback_substream[sub_num] = NULL; |
1677 | kfree(data); | 1677 | kfree(data); |
1678 | return 0; | 1678 | return 0; |
1679 | } | 1679 | } |