diff options
Diffstat (limited to 'sound/pci/pcxhr/pcxhr.c')
| -rw-r--r-- | sound/pci/pcxhr/pcxhr.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sound/pci/pcxhr/pcxhr.c b/sound/pci/pcxhr/pcxhr.c index 9d5bb76229a8..7fdcdc8c6b64 100644 --- a/sound/pci/pcxhr/pcxhr.c +++ b/sound/pci/pcxhr/pcxhr.c | |||
| @@ -458,7 +458,7 @@ static int pcxhr_update_r_buffer(struct pcxhr_stream *stream) | |||
| 458 | 458 | ||
| 459 | snd_printdd("pcxhr_update_r_buffer(pcm%c%d) : addr(%p) bytes(%zx) subs(%d)\n", | 459 | snd_printdd("pcxhr_update_r_buffer(pcm%c%d) : addr(%p) bytes(%zx) subs(%d)\n", |
| 460 | is_capture ? 'c' : 'p', | 460 | is_capture ? 'c' : 'p', |
| 461 | chip->chip_idx, (void*)subs->runtime->dma_addr, | 461 | chip->chip_idx, (void *)(long)subs->runtime->dma_addr, |
| 462 | subs->runtime->dma_bytes, subs->number); | 462 | subs->runtime->dma_bytes, subs->number); |
| 463 | 463 | ||
| 464 | pcxhr_init_rmh(&rmh, CMD_UPDATE_R_BUFFERS); | 464 | pcxhr_init_rmh(&rmh, CMD_UPDATE_R_BUFFERS); |
| @@ -626,7 +626,7 @@ static void pcxhr_trigger_tasklet(unsigned long arg) | |||
| 626 | #ifdef CONFIG_SND_DEBUG_DETECT | 626 | #ifdef CONFIG_SND_DEBUG_DETECT |
| 627 | do_gettimeofday(&my_tv2); | 627 | do_gettimeofday(&my_tv2); |
| 628 | snd_printdd("***TRIGGER TASKLET*** TIME = %ld (err = %x)\n", | 628 | snd_printdd("***TRIGGER TASKLET*** TIME = %ld (err = %x)\n", |
| 629 | my_tv2.tv_usec - my_tv1.tv_usec, err); | 629 | (long)(my_tv2.tv_usec - my_tv1.tv_usec), err); |
| 630 | #endif | 630 | #endif |
| 631 | } | 631 | } |
| 632 | 632 | ||
| @@ -846,7 +846,6 @@ static int pcxhr_open(struct snd_pcm_substream *subs) | |||
| 846 | struct pcxhr_mgr *mgr = chip->mgr; | 846 | struct pcxhr_mgr *mgr = chip->mgr; |
| 847 | struct snd_pcm_runtime *runtime = subs->runtime; | 847 | struct snd_pcm_runtime *runtime = subs->runtime; |
| 848 | struct pcxhr_stream *stream; | 848 | struct pcxhr_stream *stream; |
| 849 | int is_capture; | ||
| 850 | 849 | ||
| 851 | mutex_lock(&mgr->setup_mutex); | 850 | mutex_lock(&mgr->setup_mutex); |
| 852 | 851 | ||
| @@ -856,12 +855,10 @@ static int pcxhr_open(struct snd_pcm_substream *subs) | |||
| 856 | if( subs->stream == SNDRV_PCM_STREAM_PLAYBACK ) { | 855 | if( subs->stream == SNDRV_PCM_STREAM_PLAYBACK ) { |
| 857 | snd_printdd("pcxhr_open playback chip%d subs%d\n", | 856 | snd_printdd("pcxhr_open playback chip%d subs%d\n", |
| 858 | chip->chip_idx, subs->number); | 857 | chip->chip_idx, subs->number); |
| 859 | is_capture = 0; | ||
| 860 | stream = &chip->playback_stream[subs->number]; | 858 | stream = &chip->playback_stream[subs->number]; |
| 861 | } else { | 859 | } else { |
| 862 | snd_printdd("pcxhr_open capture chip%d subs%d\n", | 860 | snd_printdd("pcxhr_open capture chip%d subs%d\n", |
| 863 | chip->chip_idx, subs->number); | 861 | chip->chip_idx, subs->number); |
| 864 | is_capture = 1; | ||
| 865 | if (mgr->mono_capture) | 862 | if (mgr->mono_capture) |
| 866 | runtime->hw.channels_max = 1; | 863 | runtime->hw.channels_max = 1; |
| 867 | else | 864 | else |
