* [PATCH] ALSA: snd-usb: fix stream info output in /proc
@ 2012-05-21 10:47 Daniel Mack
2012-05-21 10:55 ` Takashi Iwai
0 siblings, 1 reply; 2+ messages in thread
From: Daniel Mack @ 2012-05-21 10:47 UTC (permalink / raw)
To: alsa-devel; +Cc: tiwai, clemens, linuxaudio, Daniel Mack
Set some substream struct members to make the proc interface code work
again.
Signed-off-by: Daniel Mack <zonque@gmail.com>
Reported-by: Felix Homann <linuxaudio@showlabor.de>
---
sound/usb/pcm.c | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c
index 2d3a04d..24839d9 100644
--- a/sound/usb/pcm.c
+++ b/sound/usb/pcm.c
@@ -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 *substrea
case 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 c
return 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;
}
--
1.7.5.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] ALSA: snd-usb: fix stream info output in /proc
2012-05-21 10:47 [PATCH] ALSA: snd-usb: fix stream info output in /proc Daniel Mack
@ 2012-05-21 10:55 ` Takashi Iwai
0 siblings, 0 replies; 2+ messages in thread
From: Takashi Iwai @ 2012-05-21 10:55 UTC (permalink / raw)
To: Daniel Mack; +Cc: alsa-devel, clemens, linuxaudio
At Mon, 21 May 2012 12:47:36 +0200,
Daniel Mack wrote:
>
> Set some substream struct members to make the proc interface code work
> again.
>
> Signed-off-by: Daniel Mack <zonque@gmail.com>
> Reported-by: Felix Homann <linuxaudio@showlabor.de>
Applied now.
Thanks.
Takashi
> ---
> sound/usb/pcm.c | 12 ++++++++++++
> 1 files changed, 12 insertions(+), 0 deletions(-)
>
> diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c
> index 2d3a04d..24839d9 100644
> --- a/sound/usb/pcm.c
> +++ b/sound/usb/pcm.c
> @@ -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 *substrea
> case 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 c
> return 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;
> }
>
> --
> 1.7.5.4
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-05-21 10:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-21 10:47 [PATCH] ALSA: snd-usb: fix stream info output in /proc Daniel Mack
2012-05-21 10:55 ` Takashi Iwai
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.