ALSA: snd-usb: fix stream info output in /proc
PATCH 1/1 ALSA: snd-usb: fix stream info output in /proc
Set some substream struct members to make the proc interface code work again.
Signed-off-by Daniel Mack <[email protected]>
Reported-by Felix Homann <[email protected]>
--- sound/usb/pcm.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-)
sound/usb/pcm.c +12 -0
@@ -474,6 +474,11 @@ unlock:mutex_unlock (&subs->stream->chip->shutdown_mutex); } +if (ret ==0 ) { + subs->interface = fmt->iface; + subs->altset_idx = fmt->altset_idx; + } +return ret; }
@@ -1123,13 +1128,16 @@ static int snd_usb_substream_playback_trigger(struct snd_pcm_substream *substreacase SNDRV_PCM_TRIGGER_PAUSE_RELEASE : subs->data_endpoint->prepare_data_urb = prepare_playback_urb; subs->data_endpoint->retire_data_urb = retire_playback_urb; + subs->running =1 ;return 0 ;case SNDRV_PCM_TRIGGER_STOP :stop_endpoints (subs,0 ,0 ,0 ); + subs->running =0 ;return 0 ;case SNDRV_PCM_TRIGGER_PAUSE_PUSH : subs->data_endpoint->prepare_data_urb =NULL ; subs->data_endpoint->retire_data_urb =NULL ; + subs->running =0 ;return 0 ; }
@@ -1148,15 +1156,19 @@ int snd_usb_substream_capture_trigger(struct snd_pcm_substream *substream, int creturn err; subs->data_endpoint->retire_data_urb = retire_capture_urb; + subs->running =1 ;return 0 ;case SNDRV_PCM_TRIGGER_STOP :stop_endpoints (subs,0 ,0 ,0 ); + subs->running =0 ;return 0 ;case SNDRV_PCM_TRIGGER_PAUSE_PUSH : subs->data_endpoint->retire_data_urb =NULL ; + subs->running =0 ;return 0 ;case SNDRV_PCM_TRIGGER_PAUSE_RELEASE : subs->data_endpoint->retire_data_urb = retire_capture_urb; + subs->running =1 ;return 0 ; }
Signature · 1 line
1.7.5.4
At Mon, 21 May 2012 12:47:36 +0200,
Quoted 6 lines · Daniel Mack
Set some substream struct members to make the proc interface code work again.
Signed-off-by Daniel Mack <[email protected]>Reported-by Felix Homann <[email protected]>
Applied now.
Thanks.
Takashi
Quoted 60 lines
--- sound/usb/pcm.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-)sound/usb/pcm.c +12
-0@@ -474,6 +474,11 @@ unlock:mutex_unlock (&subs->stream->chip->shutdown_mutex); } +if (ret ==0 ) { + subs->interface = fmt->iface; + subs->altset_idx = fmt->altset_idx; + } +return ret; }@@ -1123,13 +1128,16 @@ static int snd_usb_substream_playback_trigger(struct snd_pcm_substream *substreacase SNDRV_PCM_TRIGGER_PAUSE_RELEASE : subs->data_endpoint->prepare_data_urb = prepare_playback_urb; subs->data_endpoint->retire_data_urb = retire_playback_urb; + subs->running =1 ;return 0 ;case SNDRV_PCM_TRIGGER_STOP :stop_endpoints (subs,0 ,0 ,0 ); + subs->running =0 ;return 0 ;case SNDRV_PCM_TRIGGER_PAUSE_PUSH : subs->data_endpoint->prepare_data_urb =NULL ; subs->data_endpoint->retire_data_urb =NULL ; + subs->running =0 ;return 0 ; }@@ -1148,15 +1156,19 @@ int snd_usb_substream_capture_trigger(struct snd_pcm_substream *substream, int creturn err; subs->data_endpoint->retire_data_urb = retire_capture_urb; + subs->running =1 ;return 0 ;case SNDRV_PCM_TRIGGER_STOP :stop_endpoints (subs,0 ,0 ,0 ); + subs->running =0 ;return 0 ;case SNDRV_PCM_TRIGGER_PAUSE_PUSH : subs->data_endpoint->retire_data_urb =NULL ; + subs->running =0 ;return 0 ;case SNDRV_PCM_TRIGGER_PAUSE_RELEASE : subs->data_endpoint->retire_data_urb = retire_capture_urb; + subs->running =1 ;return 0 ; }Signature · 1 line
1.7.5.4