Reduce races in line6 drivers
cover Reduce races in line6 drivers
Hi,
another day, another patchset.
This time it mostly covers the races in PCM stream handling. This should work for most cases, but there are slightly uncovered conditions that is fairly difficult to fix. Maybe moving to the non-atomic PCM ops is one way, but it's too far ahead, ther are much more things to clean up before that.
Takashi
===
Takashi Iwai (5):
ALSA: line6: Fix racy loopback handling
ALSA: line6: Clear prev_fbuf and prev_fsize properly
ALSA: line6: Reorganize PCM stream handling
ALSA: line6: Make common PCM pointer callback
ALSA: line6: Handle error from line6_pcm_acquire()
sound/usb/line6/capture.c | 113 +++------------ sound/usb/line6/capture.h | 1 - sound/usb/line6/pcm.c | 351 ++++++++++++++++++++++++++------------------- sound/usb/line6/pcm.h | 145 ++++++------------- sound/usb/line6/playback.c | 139 ++++-------------- sound/usb/line6/playback.h | 1 - sound/usb/line6/toneport.c | 17 ++- 7 files changed, 302 insertions(+), 465 deletions(-)
Signature · 1 line
2.2.2
PATCH 1/5 ALSA: line6: Fix racy loopback handling
The impulse and monitor handling in submit_audio_out_urb() isn't protected thus this can be racy with the capture stream handling. This patch extends the range to protect via each stream's spinlock (now the whole submit_audio_*_urb() are covered), and take the capture stream lock additionally for the impulse and monitor handling part.
--- sound/usb/line6/capture.c | 20 +++++++++++--------- sound/usb/line6/playback.c | 24 +++++++++++++----------- 2 files changed, 24 insertions(+), 20 deletions(-)
sound/usb/line6/capture.c +11 -9
@@ -20,21 +20,19 @@/* Find a free URB and submit it. +must be called in line6pcm->in.lock context */ static int submit_audio_in_urb (struct snd_line6_pcm *line6pcm) {int index; -unsigned long flags;int i, urb_size;int ret;struct urb *urb_in; -spin_lock_irqsave (&line6pcm->in.lock, flags); index =find_first_zero_bit (&line6pcm->in.active_urbs,LINE6_ISO_BUFFERS );if (index <0 || index >=LINE6_ISO_BUFFERS ) { -spin_unlock_irqrestore (&line6pcm->in.lock, flags);dev_err (line6pcm->line6->ifcdev,"no free URB found\n" );return -EINVAL ; }
@@ -64,7 +62,6 @@ static int submit_audio_in_urb(struct snd_line6_pcm *line6pcm)dev_err (line6pcm->line6->ifcdev,"URB in #%d submission failed (%d)\n" , index, ret); -spin_unlock_irqrestore (&line6pcm->in.lock, flags);return 0 ; }
@@ -73,15 +70,18 @@ static int submit_audio_in_urb(struct snd_line6_pcm *line6pcm)*/ int line6_submit_audio_in_all_urbs (struct snd_line6_pcm *line6pcm) { -int ret, i; +unsigned long flags; +int ret =0 , i; +spin_lock_irqsave (&line6pcm->in.lock, flags);for (i =0 ; i <LINE6_ISO_BUFFERS ; ++i) { ret =submit_audio_in_urb (line6pcm);if (ret <0 ) -return ret; +break ; } -return 0 ; +spin_unlock_irqrestore (&line6pcm->in.lock, flags); +return ret; }/*
@@ -137,7 +137,9 @@ void line6_capture_check_period(struct snd_line6_pcm *line6pcm, int length) line6pcm->in.bytes += length;if (line6pcm->in.bytes >= line6pcm->in.period) { line6pcm->in.bytes %= line6pcm->in.period; +spin_unlock (&line6pcm->in.lock);snd_pcm_period_elapsed (substream); +spin_lock (&line6pcm->in.lock); } }
@@ -196,8 +198,6 @@ static void audio_in_callback(struct urb *urb)if (test_and_clear_bit (index, &line6pcm->in.unlink_urbs)) shutdown =1 ; -spin_unlock_irqrestore (&line6pcm->in.lock, flags); -if (!shutdown) {submit_audio_in_urb (line6pcm);
@@ -206,6 +206,8 @@ static void audio_in_callback(struct urb *urb) &line6pcm->flags))line6_capture_check_period (line6pcm, length); } + +spin_unlock_irqrestore (&line6pcm->in.lock, flags); }/* open capture callback */
sound/usb/line6/playback.c +13 -11
@@ -134,11 +134,11 @@ static void add_monitor_signal(struct urb *urb_out, unsigned char *signal,/* Find a free URB, prepare audio data, and submit URB. +must be called in line6pcm->out.lock context */ static int submit_audio_out_urb (struct snd_line6_pcm *line6pcm) {int index; -unsigned long flags;int i, urb_size, urb_frames;int ret;const int bytes_per_frame = line6pcm->properties->bytes_per_frame;
@@ -149,12 +149,10 @@ static int submit_audio_out_urb(struct snd_line6_pcm *line6pcm) (USB_INTERVALS_PER_SECOND /LINE6_ISO_INTERVAL );struct urb *urb_out; -spin_lock_irqsave (&line6pcm->out.lock, flags); index =find_first_zero_bit (&line6pcm->out.active_urbs,LINE6_ISO_BUFFERS );if (index <0 || index >=LINE6_ISO_BUFFERS ) { -spin_unlock_irqrestore (&line6pcm->out.lock, flags);dev_err (line6pcm->line6->ifcdev,"no free URB found\n" );return -EINVAL ; }
@@ -187,7 +185,6 @@ static int submit_audio_out_urb(struct snd_line6_pcm *line6pcm)if (urb_size ==0 ) {/* can't determine URB size */ -spin_unlock_irqrestore (&line6pcm->out.lock, flags);dev_err (line6pcm->line6->ifcdev,"driver bug: urb_size = 0\n" );return -EINVAL ; }
@@ -242,7 +239,8 @@ static int submit_audio_out_urb(struct snd_line6_pcm *line6pcm) urb_out->transfer_buffer_length); } -if (line6pcm->prev_fbuf !=NULL ) { +spin_lock_nested (&line6pcm->in.lock,SINGLE_DEPTH_NESTING ); +if (line6pcm->prev_fbuf) {if (line6pcm->flags &LINE6_BITS_PCM_IMPULSE ) {create_impulse_test_signal (line6pcm, urb_out, bytes_per_frame);
@@ -266,6 +264,7 @@ static int submit_audio_out_urb(struct snd_line6_pcm *line6pcm) bytes_per_frame); } } +spin_unlock (&line6pcm->in.lock); ret =usb_submit_urb (urb_out,GFP_ATOMIC );
@@ -275,7 +274,6 @@ static int submit_audio_out_urb(struct snd_line6_pcm *line6pcm)dev_err (line6pcm->line6->ifcdev,"URB out #%d submission failed (%d)\n" , index, ret); -spin_unlock_irqrestore (&line6pcm->out.lock, flags);return 0 ; }
@@ -284,15 +282,18 @@ static int submit_audio_out_urb(struct snd_line6_pcm *line6pcm)*/ int line6_submit_audio_out_all_urbs (struct snd_line6_pcm *line6pcm) { -int ret, i; +unsigned long flags; +int ret =0 , i; +spin_lock_irqsave (&line6pcm->out.lock, flags);for (i =0 ; i <LINE6_ISO_BUFFERS ; ++i) { ret =submit_audio_out_urb (line6pcm);if (ret <0 ) -return ret; +break ; } -return 0 ; +spin_unlock_irqrestore (&line6pcm->in.lock, flags); +return ret; }/*
@@ -346,8 +347,6 @@ static void audio_out_callback(struct urb *urb)if (test_and_clear_bit (index, &line6pcm->out.unlink_urbs)) shutdown =1 ; -spin_unlock_irqrestore (&line6pcm->out.lock, flags); -if (!shutdown) {submit_audio_out_urb (line6pcm);
@@ -356,10 +355,13 @@ static void audio_out_callback(struct urb *urb) line6pcm->out.bytes += length;if (line6pcm->out.bytes >= line6pcm->out.period) { line6pcm->out.bytes %= line6pcm->out.period; +spin_unlock (&line6pcm->out.lock);snd_pcm_period_elapsed (substream); +spin_lock (&line6pcm->out.lock); } } } +spin_unlock_irqrestore (&line6pcm->out.lock, flags); }/* open playback callback */
Signature · 1 line
2.2.2
Re: [PATCH 1/5] ALSA: line6: Fix racy loopback handling
Quoted 14 lines · Takashi Iwai
/* open capture callback */
sound/usb/line6/playback.c +3
-1@@ -284,15 +282,18 @@ static int submit_audio_out_urb(struct snd_line6_pcm *line6pcm)*/ int line6_submit_audio_out_all_urbs (struct snd_line6_pcm *line6pcm) { -int ret, i; +unsigned long flags; +int ret =0 , i; +spin_lock_irqsave (&line6pcm->out.lock, flags);
sound/usb/line6/playback.c static int submit_audio_out_urb(struct snd_line6_pcm *line6pcm) · line 296
Quoted 10 lines
sound/usb/line6/playback.c +3
-2for (i =0 ; i <LINE6_ISO_BUFFERS ; ++i) { ret =submit_audio_out_urb (line6pcm);if (ret <0 ) -return ret; +break ; } -return 0 ; +spin_unlock_irqrestore (&line6pcm->in.lock, flags); +return ret;
s/in.lock/out.lock/
PATCH 2/5 ALSA: line6: Clear prev_fbuf and prev_fsize properly
In reply to Takashi IwaiClearing prev_fsize in line6_pcm_acquire() is pretty racy. This can be called at any time while the stream is being played. Rather better to clear prev_fbuf and prev_fsize at the proper place like the stream stop for capture, and just after copying the monitor / impulse data inside the spinlock.
--- sound/usb/line6/pcm.c | 8 ++++---- sound/usb/line6/playback.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-)
sound/usb/line6/pcm.c +4 -4
@@ -171,8 +171,6 @@ int line6_pcm_acquire(struct snd_line6_pcm *line6pcm, int channels) flags_final =0 ; - line6pcm->prev_fbuf =NULL ; -if (test_flags (flags_old, flags_new,LINE6_BITS_CAPTURE_BUFFER )) { err =line6_alloc_stream_buffer (line6pcm, &line6pcm->in);if (err <0 )
@@ -193,7 +191,6 @@ int line6_pcm_acquire(struct snd_line6_pcm *line6pcm, int channels) } line6pcm->in.count =0 ; - line6pcm->prev_fsize =0 ; err =line6_submit_audio_in_all_urbs (line6pcm);if (err <0 )
@@ -248,8 +245,11 @@ int line6_pcm_release(struct snd_line6_pcm *line6pcm, int channels) flags_new = flags_old & ~channels; }while (cmpxchg (&line6pcm->flags, flags_old, flags_new) != flags_old); -if (test_flags (flags_new, flags_old,LINE6_BITS_CAPTURE_STREAM )) +if (test_flags (flags_new, flags_old,LINE6_BITS_CAPTURE_STREAM )) {line6_unlink_audio_urbs (line6pcm, &line6pcm->in); + line6pcm->prev_fbuf =NULL ; + line6pcm->prev_fsize =0 ; + }if (test_flags (flags_new, flags_old,LINE6_BITS_CAPTURE_BUFFER )) {line6_wait_clear_audio_urbs (line6pcm, &line6pcm->in);
sound/usb/line6/playback.c +3 -3
@@ -166,9 +166,7 @@ static int submit_audio_out_urb(struct snd_line6_pcm *line6pcm)struct usb_iso_packet_descriptor *fout = &urb_out->iso_frame_desc[i]; -if (line6pcm->flags &LINE6_BITS_CAPTURE_STREAM ) - fsize = line6pcm->prev_fsize; - + fsize = line6pcm->prev_fsize;if (fsize ==0 ) {int n;
@@ -263,6 +261,8 @@ static int submit_audio_out_urb(struct snd_line6_pcm *line6pcm) line6pcm->volume_monitor, bytes_per_frame); } + line6pcm->prev_fbuf =NULL ; + line6pcm->prev_fsize =0 ; }spin_unlock (&line6pcm->in.lock);
Signature · 1 line
2.2.2
PATCH 3/5 ALSA: line6: Reorganize PCM stream handling
In reply to Takashi IwaiThe current code deals with the stream start / stop solely via line6_pcm_acquire() and line6_pcm_release(). This was (supposedly) intended to avoid the races, but it doesn't work as expected. The concurrent acquire and release calls can be performed without proper protections, thus this might result in memory corruption. Furthermore, we can't take a mutex to protect the whole function because it can be called from the PCM trigger callback that is an atomic context. Also spinlock isn't appropriate because the function allocates with kmalloc with GFP_KERNEL. That is, these function just lead to singular problems.
This is an attempt to reduce the existing races. First off, separate both the stream buffer management and the stream URB management. The former is protected via a newly introduced state_mutex while the latter is protected via each line6_pcm_stream lock.
Secondly, the stream state are now managed in opened and running bit flags of each line6_pcm_stream. Not only this a bit clearer than previous combined bit flags, this also gives a better abstraction. These rewrites allows us to make common hw_params and hw_free callbacks for both playback and capture directions.
For the monitor and impulse operations, still line6_pcm_acquire() and line6_pcm_release() are used. They call internally the corresponding functions for both playback and capture streams with proper lock or mutex. Unlike the previous versions, these function don't take the bit masks but the only single type value. Also they are supposed to be applied only as duplex operations.
--- sound/usb/line6/capture.c | 88 ++---------- sound/usb/line6/capture.h | 1 - sound/usb/line6/pcm.c | 333 +++++++++++++++++++++++++-------------------- sound/usb/line6/pcm.h | 144 ++++++-------------- sound/usb/line6/playback.c | 104 ++------------ sound/usb/line6/playback.h | 1 - sound/usb/line6/toneport.c | 6 +- 7 files changed, 252 insertions(+), 425 deletions(-)
sound/usb/line6/capture.c +10 -78
@@ -67,20 +67,18 @@ static int submit_audio_in_urb(struct snd_line6_pcm *line6pcm)/* Submit all currently available capture URBs. +must be called in line6pcm->out.lock context */ int line6_submit_audio_in_all_urbs (struct snd_line6_pcm *line6pcm) { -unsigned long flags;int ret =0 , i; -spin_lock_irqsave (&line6pcm->in.lock, flags);for (i =0 ; i <LINE6_ISO_BUFFERS ; ++i) { ret =submit_audio_in_urb (line6pcm);if (ret <0 )break ; } -spin_unlock_irqrestore (&line6pcm->in.lock, flags);return ret; }
@@ -187,10 +185,10 @@ static void audio_in_callback(struct urb *urb) line6pcm->prev_fbuf = fbuf; line6pcm->prev_fsize = fsize; -if (!(line6pcm->flags &LINE6_BITS_PCM_IMPULSE )) -if (test_bit (LINE6_INDEX_PCM_ALSA_CAPTURE_STREAM , - &line6pcm->flags) && (fsize >0 )) -line6_capture_copy (line6pcm, fbuf, fsize); +if (!test_bit (LINE6_STREAM_IMPULSE , &line6pcm->in.running) && +test_bit (LINE6_STREAM_PCM , &line6pcm->in.running) && + fsize >0 ) +line6_capture_copy (line6pcm, fbuf, fsize); }clear_bit (index, &line6pcm->in.active_urbs);
@@ -201,10 +199,9 @@ static void audio_in_callback(struct urb *urb)if (!shutdown) {submit_audio_in_urb (line6pcm); -if (!(line6pcm->flags &LINE6_BITS_PCM_IMPULSE )) -if (test_bit (LINE6_INDEX_PCM_ALSA_CAPTURE_STREAM , - &line6pcm->flags)) -line6_capture_check_period (line6pcm, length); +if (!test_bit (LINE6_STREAM_IMPULSE , &line6pcm->in.running) && +test_bit (LINE6_STREAM_PCM , &line6pcm->in.running)) +line6_capture_check_period (line6pcm, length); }spin_unlock_irqrestore (&line6pcm->in.lock, flags);
@@ -234,71 +231,6 @@ static int snd_line6_capture_close(struct snd_pcm_substream *substream)return 0 ; } -/* hw_params capture callback */ -static int snd_line6_capture_hw_params (struct snd_pcm_substream *substream, -struct snd_pcm_hw_params *hw_params) -{ -int ret; -struct snd_line6_pcm *line6pcm =snd_pcm_substream_chip (substream); - - ret =line6_pcm_acquire (line6pcm,LINE6_BIT_PCM_ALSA_CAPTURE_BUFFER ); - -if (ret <0 ) -return ret; - - ret =snd_pcm_lib_malloc_pages (substream, -params_buffer_bytes (hw_params)); -if (ret <0 ) { -line6_pcm_release (line6pcm,LINE6_BIT_PCM_ALSA_CAPTURE_BUFFER ); -return ret; - } - - line6pcm->in.period =params_period_bytes (hw_params); -return 0 ; -} - -/* hw_free capture callback */ -static int snd_line6_capture_hw_free (struct snd_pcm_substream *substream) -{ -struct snd_line6_pcm *line6pcm =snd_pcm_substream_chip (substream); - -line6_pcm_release (line6pcm,LINE6_BIT_PCM_ALSA_CAPTURE_BUFFER ); -return snd_pcm_lib_free_pages (substream); -} - -/* trigger callback */ -int snd_line6_capture_trigger (struct snd_line6_pcm *line6pcm,int cmd) -{ -int err; - -switch (cmd) { -case SNDRV_PCM_TRIGGER_START : -case SNDRV_PCM_TRIGGER_RESUME : - err =line6_pcm_acquire (line6pcm, -LINE6_BIT_PCM_ALSA_CAPTURE_STREAM ); - -if (err <0 ) -return err; - -break ; - -case SNDRV_PCM_TRIGGER_STOP : -case SNDRV_PCM_TRIGGER_SUSPEND : - err =line6_pcm_release (line6pcm, -LINE6_BIT_PCM_ALSA_CAPTURE_STREAM ); - -if (err <0 ) -return err; - -break ; - -default : -return -EINVAL ; - } - -return 0 ; -} -/* capture pointer callback */ static snd_pcm_uframes_t snd_line6_capture_pointer (struct snd_pcm_substream *substream)
@@ -313,8 +245,8 @@ struct snd_pcm_ops snd_line6_capture_ops = { .open = snd_line6_capture_open, .close = snd_line6_capture_close, .ioctl = snd_pcm_lib_ioctl, - .hw_params = snd_line6_capture_hw_params, - .hw_free = snd_line6_capture_hw_free, + .hw_params = snd_line6_hw_params, + .hw_free = snd_line6_hw_free, .prepare = snd_line6_prepare, .trigger = snd_line6_trigger, .pointer = snd_line6_capture_pointer,
sound/usb/line6/capture.h +0 -1
@@ -25,6 +25,5 @@ extern void line6_capture_check_period(struct snd_line6_pcm *line6pcm, int length);extern int line6_create_audio_in_urbs (struct snd_line6_pcm *line6pcm);extern int line6_submit_audio_in_all_urbs (struct snd_line6_pcm *line6pcm); -extern int snd_line6_capture_trigger (struct snd_line6_pcm *line6pcm,int cmd);#endif
sound/usb/line6/pcm.c +187 -146
407 lines not on this page · raw message
sound/usb/line6/pcm.h +40 -104
176 lines not on this page · raw message
sound/usb/line6/playback.c +12 -92
164 lines not on this page · raw message
sound/usb/line6/playback.h +0 -1
@@ -31,6 +31,5 @@ extern struct snd_pcm_ops snd_line6_playback_ops;extern int line6_create_audio_out_urbs (struct snd_line6_pcm *line6pcm);extern int line6_submit_audio_out_all_urbs (struct snd_line6_pcm *line6pcm); -extern int snd_line6_playback_trigger (struct snd_line6_pcm *line6pcm,int cmd);#endif
sound/usb/line6/toneport.c +3 -3
@@ -189,9 +189,9 @@ static int snd_toneport_monitor_put(struct snd_kcontrol *kcontrol, line6pcm->volume_monitor = ucontrol->value.integer.value[0 ];if (line6pcm->volume_monitor >0 ) -line6_pcm_acquire (line6pcm,LINE6_BITS_PCM_MONITOR ); +line6_pcm_acquire (line6pcm,LINE6_STREAM_MONITOR );else -line6_pcm_release (line6pcm,LINE6_BITS_PCM_MONITOR ); +line6_pcm_release (line6pcm,LINE6_STREAM_MONITOR );return 1 ; }
@@ -252,7 +252,7 @@ static void toneport_start_pcm(unsigned long arg)struct usb_line6_toneport *toneport = (struct usb_line6_toneport *)arg;struct usb_line6 *line6 = &toneport->line6; -line6_pcm_acquire (line6->line6pcm,LINE6_BITS_PCM_MONITOR ); +line6_pcm_acquire (line6->line6pcm,LINE6_STREAM_MONITOR ); }/* control definition */
Signature · 1 line
2.2.2
Re: [PATCH 3/5] ALSA: line6: Reorganize PCM stream handling
Quoted 3 lines · Takashi Iwai
Secondly, the stream state are now managed in opened and running bit flags of each
line6_pcm_stream. Not only this a bit clearer than previous combined bit flags, this also gives a better abstraction.
Nice.
sound/usb/line6/capture.c static int submit_audio_in_urb(struct snd_line6_pcm *line6pcm) · line 70
Quoted 9 lines
sound/usb/line6/capture.c +1
-0@@ -67,20 +67,18 @@ static int submit_audio_in_urb(struct snd_line6_pcm *line6pcm)/* Submit all currently available capture URBs. +must be called in line6pcm->out.lock context
s/out.lock/in.lock/
PATCH 4/5 ALSA: line6: Make common PCM pointer callback
In reply to Takashi IwaiBoth playback and capture callbacks are identical, so let's merge them.
--- sound/usb/line6/capture.c | 11 +---------- sound/usb/line6/pcm.c | 9 +++++++++ sound/usb/line6/pcm.h | 1 + sound/usb/line6/playback.c | 11 +---------- 4 files changed, 12 insertions(+), 20 deletions(-)
sound/usb/line6/capture.c +1 -10
@@ -231,15 +231,6 @@ static int snd_line6_capture_close(struct snd_pcm_substream *substream)return 0 ; } -/* capture pointer callback */ -static snd_pcm_uframes_t -snd_line6_capture_pointer (struct snd_pcm_substream *substream) -{ -struct snd_line6_pcm *line6pcm =snd_pcm_substream_chip (substream); - -return line6pcm->in.pos_done; -} -/* capture operators */ struct snd_pcm_ops snd_line6_capture_ops = { .open = snd_line6_capture_open,
@@ -249,7 +240,7 @@ struct snd_pcm_ops snd_line6_capture_ops = { .hw_free = snd_line6_hw_free, .prepare = snd_line6_prepare, .trigger = snd_line6_trigger, - .pointer = snd_line6_capture_pointer, + .pointer = snd_line6_pointer, };int line6_create_audio_in_urbs (struct snd_line6_pcm *line6pcm)
sound/usb/line6/pcm.c +9 -0
@@ -266,6 +266,15 @@ int snd_line6_trigger(struct snd_pcm_substream *substream, int cmd)return 0 ; } +/* common PCM pointer callback */ +snd_pcm_uframes_t snd_line6_pointer (struct snd_pcm_substream *substream) +{ +struct snd_line6_pcm *line6pcm =snd_pcm_substream_chip (substream); +struct line6_pcm_stream *pstr =get_stream (line6pcm, substream->stream); + +return pstr->pos_done; +} +/* Acquire and start duplex streams: * type is either LINE6_STREAM_IMPULSE or LINE6_STREAM_MONITOR */
sound/usb/line6/pcm.h +1 -0
@@ -214,6 +214,7 @@ extern int snd_line6_prepare(struct snd_pcm_substream *substream);extern int snd_line6_hw_params (struct snd_pcm_substream *substream,struct snd_pcm_hw_params *hw_params);extern int snd_line6_hw_free (struct snd_pcm_substream *substream); +extern snd_pcm_uframes_t snd_line6_pointer (struct snd_pcm_substream *substream);extern void line6_pcm_disconnect (struct snd_line6_pcm *line6pcm);extern int line6_pcm_acquire (struct snd_line6_pcm *line6pcm,int type);extern void line6_pcm_release (struct snd_line6_pcm *line6pcm,int type);
sound/usb/line6/playback.c +1 -10
@@ -380,15 +380,6 @@ static int snd_line6_playback_close(struct snd_pcm_substream *substream)return 0 ; } -/* playback pointer callback */ -static snd_pcm_uframes_t -snd_line6_playback_pointer (struct snd_pcm_substream *substream) -{ -struct snd_line6_pcm *line6pcm =snd_pcm_substream_chip (substream); - -return line6pcm->out.pos_done; -} -/* playback operators */ struct snd_pcm_ops snd_line6_playback_ops = { .open = snd_line6_playback_open,
@@ -398,7 +389,7 @@ struct snd_pcm_ops snd_line6_playback_ops = { .hw_free = snd_line6_hw_free, .prepare = snd_line6_prepare, .trigger = snd_line6_trigger, - .pointer = snd_line6_playback_pointer, + .pointer = snd_line6_pointer, };int line6_create_audio_out_urbs (struct snd_line6_pcm *line6pcm)
Signature · 1 line
2.2.2
PATCH 5/5 ALSA: line6: Handle error from line6_pcm_acquire()
In reply to Takashi Iwai--- sound/usb/line6/pcm.c | 13 ++++++++++--- sound/usb/line6/toneport.c | 13 ++++++++++--- 2 files changed, 20 insertions(+), 6 deletions(-)
sound/usb/line6/pcm.c +10 -3
@@ -45,15 +45,22 @@ static int snd_line6_impulse_volume_put(struct snd_kcontrol *kcontrol, {struct snd_line6_pcm *line6pcm =snd_kcontrol_chip (kcontrol);int value = ucontrol->value.integer.value[0 ]; +int err;if (line6pcm->impulse_volume == value)return 0 ; line6pcm->impulse_volume = value; -if (value >0 ) -line6_pcm_acquire (line6pcm,LINE6_STREAM_IMPULSE ); -else +if (value >0 ) { + err =line6_pcm_acquire (line6pcm,LINE6_STREAM_IMPULSE ); +if (err <0 ) { + line6pcm->impulse_volume =0 ; +line6_pcm_release (line6pcm,LINE6_STREAM_IMPULSE ); +return err; + } + }else {line6_pcm_release (line6pcm,LINE6_STREAM_IMPULSE ); + }return 1 ; }
sound/usb/line6/toneport.c +10 -3
@@ -182,16 +182,23 @@ static int snd_toneport_monitor_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) {struct snd_line6_pcm *line6pcm =snd_kcontrol_chip (kcontrol); +int err;if (ucontrol->value.integer.value[0 ] == line6pcm->volume_monitor)return 0 ; line6pcm->volume_monitor = ucontrol->value.integer.value[0 ]; -if (line6pcm->volume_monitor >0 ) -line6_pcm_acquire (line6pcm,LINE6_STREAM_MONITOR ); -else +if (line6pcm->volume_monitor >0 ) { + err =line6_pcm_acquire (line6pcm,LINE6_STREAM_MONITOR ); +if (err <0 ) { + line6pcm->volume_monitor =0 ; +line6_pcm_release (line6pcm,LINE6_STREAM_MONITOR ); +return err; + } + }else {line6_pcm_release (line6pcm,LINE6_STREAM_MONITOR ); + }return 1 ; }
Signature · 1 line
2.2.2