aboutsummaryrefslogtreecommitdiffstats
path: root/sound/usb
Commit message (Collapse)AuthorAge
...
| * ALSA: line6: Fix racy loopback handlingTakashi Iwai2015-01-28
| | | | | | | | | | | | | | | | | | | | | | 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. Tested-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: line6: Minor tidy up in line6_probe()Takashi Iwai2015-01-28
| | | | | | | | | | | | | | | | Move the check of multi configurations before snd_card_new() as a short path, and reduce superfluous pointer references. Tested-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: line6: Let snd_card_new() allocate private dataTakashi Iwai2015-01-28
| | | | | | | | | | | | | | | | | | Instead of allocating the private data individually in each driver's probe at first, let snd_card_new() allocate the data that is called in line6_probe(). This simplifies the primary probe functions. Tested-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: line6: Drop interface argument from private_init and disconnect callbacksTakashi Iwai2015-01-28
| | | | | | | | | | | | | | | | | | | | | | The interface argument is used just for retrieving the assigned device, which can be already found in line6->ifcdev. Drop them from the callbacks. Also, pass the usb id to private_init so that the driver can deal with it there. This is a preliminary work for the further cleanup to move the whole allocation into driver.c. Tested-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: line6: Skip volume manipulation during silence copyingTakashi Iwai2015-01-28
| | | | | | | | | | | | | | | | A minor optimization; while pausing, the driver just copies the zero that doesn't need any volume changes. Tested-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: line6: Do clipping in volume / monitor manipulationsTakashi Iwai2015-01-28
| | | | | | | | | | Tested-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: line6: Consolidate PCM stream buffer allocation and freeTakashi Iwai2015-01-28
| | | | | | | | | | | | | | | | | | The PCM stream buffer allocation and free are identical for both playback and capture streams. Provide single helper functions. These are used only in pcm.c, thus they can be even static. Tested-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: line6: Use dev_err()Takashi Iwai2015-01-28
| | | | | | | | | | | | | | This is the last remaining snd_printk() usage in this driver. Tested-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: line6: Consolidate URB unlink and sync helpersTakashi Iwai2015-01-28
| | | | | | | | | | | | | | | | The codes to unlink and sync URBs are identical for both playback and capture streams. Consolidate to single helper functions. Tested-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: line6: Rearrange PCM structureTakashi Iwai2015-01-28
| | | | | | | | | | | | | | | | | | | | | | Introduce a new line6_pcm_stream structure and group individual fields of snd_line6_pcm struct to playback and capture groups. This patch itself just does rename and nothing else. More meaningful cleanups based on these fields shuffling will follow. Tested-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: line6: Drop voodoo workaroundsTakashi Iwai2015-01-28
| | | | | | | | | | | | | | | | If the problem still really remains, we should fix it instead of papering over it like this... Tested-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: line6: Use incremental loopTakashi Iwai2015-01-28
| | | | | | | | | | | | | | | | Using a decremental loop without particular reasons worsens the readability a lot. Use incremental loops instead. Tested-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: line6: Drop superfluous spinlock for triggerTakashi Iwai2015-01-28
| | | | | | | | | | | | | | | | The trigger callback is already spinlocked, so we need no more lock here (even for the linked substreams). Let's drop it. Tested-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: line6: Fix the error recovery in line6_pcm_acquire()Takashi Iwai2015-01-28
| | | | | | | | | | | | | | | | | | | | | | | | | | line6_pcm_acquire() tries to restore the newly obtained resources at the error path. But some flags aren't recorded and released properly when the corresponding buffer is already present. These bits have to be cleared in the error recovery, too. Also, "flags_final" can be initialized to zero since we pass only the subset of "channels" bits. Tested-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: line6: Use logical ORTakashi Iwai2015-01-28
| | | | | | | | | | | | | | Fixed a few places using bits OR wrongly for condition checks. Tested-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: line6: Fix missing error handling in line6_pcm_acquire()Takashi Iwai2015-01-28
| | | | | | | | | | Tested-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: line6: Reduce superfluous spinlock in midi.cTakashi Iwai2015-01-28
| | | | | | | | | | | | | | | | | | | | The midi_transmit_lock is used always inside the send_urb_lock, thus it doesn't play any role. Let's kill it. Also, rename "send_urb_lock" as a more simple name "lock" since this is the only lock for midi. Tested-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: line6: Remove unused line6_nop_read()Takashi Iwai2015-01-28
| | | | | | | | | | | | | | | | The function isn't used any longer after rewriting from sysfs to leds class in toneport.c. Tested-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: line6: Fix memory leak at probe error pathTakashi Iwai2015-01-28
| | | | | | | | | | | | | | | | | | Fix memory leak at probe error path by rearranging the call order in line6_destruct() so that the common destructor is always called. Also this simplifies the error path to a single goto label. Tested-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: line6: Minor refactoringTakashi Iwai2015-01-28
| | | | | | | | | | | | | | Split some codes in the lengthy line6_probe(). Tested-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: line6/toneport: Implement LED controls via LED classTakashi Iwai2015-01-28
| | | | | | | | | | | | | | | | Instead of non-standard sysfs, reimplement the LED controls on TonePort as LED class devices. Tested-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: line6/toneport: Fix wrong argument for toneport_has_led()Takashi Iwai2015-01-28
| | | | | | | | | | Tested-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: line6: Don't forget to call driver's destructor at error pathTakashi Iwai2015-01-28
| | | | | | | | | | | | | | | | | | Currently disconnect callback is used as a driver's destructor, and this has to be called not only at the disconnection time but also at the error paths during probe. Tested-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: line6/toneport: Move setup_timer() at the beginningTakashi Iwai2015-01-28
| | | | | | | | | | | | | | | | | | ... so that timer_del_sync() in the destructor can be called safely at any time. Also move the mod_timer() call in toneport_setup(), which is a bit clearer place. Tested-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: line6: Remove superfluous NULL checks in each driverTakashi Iwai2015-01-28
| | | | | | | | | | | | | | | | | | The interface and driver objects are always set when callbacks are called. Drop such superfluous NULL checks in init and disconnect calls of each driver. Tested-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: line6: Abort if inconsistent usbdev is found at disconnectTakashi Iwai2015-01-28
| | | | | | | | | | | | | | | | | | It's utterly unsafe to proceed further the disconnect procedure if the assigned usbdev is inconsistent with the expected object. Better to put a WARN_ON() for more cautions and abort immediately. Tested-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: line6: Yet more cleanup of superfluous NULL checksTakashi Iwai2015-01-28
| | | | | | | | | | | | | | ... in line6_disconnect() as well. Tested-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | Merge branch 'for-linus' into for-nextTakashi Iwai2015-01-26
|\ \ | | | | | | | | | | | | Sync with the latest 3.19-rc state for applying other ALSA sequencer core fixes.
| * | ALSA: usb-audio: Add mic volume fix quirk for Logitech Webcam C210Jason Lee Cragg2015-01-18
| | | | | | | | | | | | | | | | | | Signed-off-by: Jason Lee Cragg <jcragg@gmail.com> Cc: <stable@vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | Merge branch 'topic/timer-cleanup' into for-nextTakashi Iwai2015-01-20
|\ \ \
| * | | ALSA: usb-audio: Use setup_timer() and mod_timer()Takashi Iwai2015-01-19
| | | | | | | | | | | | | | | | | | | | | | | | No functional change, refactoring with the standard helpers. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | | Merge branch 'topic/line6' into for-nextTakashi Iwai2015-01-20
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | ALSA: line6: Remove driver version from header commentChris Rorvick2015-01-20
| | | | | | | | | | | | | | | | | | | | | | | | The driver version string was removed in an ealier commit for being useless. These are equally useless. Signed-off-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | ALSA: line6: Refer to manufacturer as "Line 6"Chris Rorvick2015-01-20
| | | | | | | | | | | | | | | | | | | | | | | | The correct spelling includes the space. Fix this in strings and comments that refer to the manufacturer. Signed-off-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | ALSA: line6: Remove superfluous NULL checksChris Rorvick2015-01-20
| | | | | | | | | | | | | | | Signed-off-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | ALSA: line6: Drop line6_send_program() and line6_transmit_parameter()Takashi Iwai2015-01-20
| | | | | | | | | | | | | | | | | | | | | Both functions are used nowhere. Tested-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | ALSA: line6: Make line6_send_raw_message() staticTakashi Iwai2015-01-20
| | | | | | | | | | | | | | | | | | | | | It's used only locally. Tested-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | ALSA: line6: Sync PCM stop at disconnectTakashi Iwai2015-01-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call line6_pcm_disconnect() at disconnect to make sure that all URBs are cleared. Also reduce the superfluous snd_pcm_stop() calls from the function (and remove the unused function) since the streams are guaranteed to be stopped at this point via snd_card_disconnect(). Tested-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | ALSA: line6: Remove superfluous disconnect call in suspend handlerTakashi Iwai2015-01-20
| | | | | | | | | | | | | | | | | | | | | | | | Calling line6_pcm_disconnect() at suspend callback is superfluous and rather confusing. Let's get rid of it. Tested-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | ALSA: line6: Remove CHECK_RETURN macroTakashi Iwai2015-01-20
| | | | | | | | | | | | | | | | | | | | | Such a macro doesn't improve readability. Tested-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | ALSA: line6: Drop MISSING_CASE macroTakashi Iwai2015-01-20
| | | | | | | | | | | | | | | | | | | | | Such a debug is needed in the core code, not in each lowlevel driver. Tested-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | ALSA: line6: Remove driver version stringTakashi Iwai2015-01-20
| | | | | | | | | | | | | | | | | | | | | | | | This is rather useless for a driver that has been already merged into the official tree. Tested-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | ALSA: line6: Reorganize card resource handlingTakashi Iwai2015-01-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a fairly big rewrite regarding the card resource management in line6 drivers: - The card creation is moved into line6_probe(). This adds the global destructor to private_free, so that each driver doesn't have to call it any longer. - The USB disconnect callback handles the card release, thus each driver needs to concentrate on only its own resources. No need to snd_card_*() call in the destructor. - Fix the potential stall in disconnection by removing snd_card_free(). It's replaced with snd_card_free_when_closed() for asynchronous release. - The only remaining operation for the card in each driver is the call of snd_card_register(). All the rest are dealt in the common module by itself. - These ended up with removal of audio.[ch] as a result of a reduction of one layer. Each driver just needs to call line6_probe(). Tested-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | ALSA: line6: Drop superfluous irqsave/irqrestore in PCM trigger callbackTakashi Iwai2015-01-20
| | | | | | | | | | | | | | | | | | | | | | | | The PCM trigger callback is guaranteed to be called already in spinlock / irq-disabled context. Tested-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | ALSA: line6: Don't handle PCM trigger for other cardsTakashi Iwai2015-01-20
| | | | | | | | | | | | | | | | | | | | | Otherwise it oopses. Tested-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | ALSA: line6: Remove superfluous out-of-memory error messagesTakashi Iwai2015-01-20
| | | | | | | | | | | | | | | | | | | | | Kernel already shows the error in the common path. Tested-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | ALSA: line6: Drop usb_device sysfs symlinkTakashi Iwai2015-01-20
| | | | | | | | | | | | | | | | | | | | | It's non-standard and rather superfluous. Tested-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | ALSA: line6: Drop invalid SNDRV_PCM_INFO_RESUME flagTakashi Iwai2015-01-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The line6 drivers don't support the full resume although they set SNDRV_PCM_INFO_RESUME. These flags have to be dropped to inform properly to the user-space. Also, drop the CONFIG_PM in trigger callbacks, too, which are rather superfluous. Tested-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | ALSA: line6: Drop superfluous snd_device for rawmidiTakashi Iwai2015-01-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | Like the previous fix for PCM, attach the card-specific resource into rawmidi->private_data instead of handling in a snd_device object. This simplifies the code and structure. Tested-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | ALSA: line6: Drop superfluous snd_device for PCMTakashi Iwai2015-01-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of handling the card-specific resource in snd_device, attach it into pcm->private_data and release it directly in private_free. This simplifies the code and structure. Tested-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
generated by cgit v1.2.2 (git 2.25.0) at 2025-04-03 13:08:25 -0400