15 Feb, 2017
1 commit
-
commit f3d83317a69e7d658e7c83e24f8b31ac533c39e3 upstream.
This reverts commit f6a0dd107ad0c8b59d1c9735eea4b8cb9f460949.
The commit caused a regression on LINE6 Transport that has no control
caps. Although reverting the commit may result back in a spurious
error message for some device again, it's the simplest regression fix,
hence it's taken as is at first. The further code fix will follow
later.Fixes: f6a0dd107ad0 ("ALSA: line6: Only determine control port properties if needed")
Reported-by: Igor Zinovev
Signed-off-by: Takashi Iwai
Signed-off-by: Greg Kroah-Hartman
13 Oct, 2016
1 commit
-
The error checking here is messed up so we could end up dereferencing
-EFAULT.Fixes: a16039cbf1a1 ('ALSA: line6: Add hwdep interface to access the POD control messages')
Signed-off-by: Dan Carpenter
Reviewed-by: Takashi Sakamoto
Signed-off-by: Takashi Iwai
10 Oct, 2016
1 commit
-
The commit c039aaa77a7d1d9375665a8b59ec16dc7d23e259 was incomplete,
missing part of the setup for Live. This makes also audio input work,
in addition to audio output.Fixes: c039aaa77a7d1d9375665a8b59ec16dc7d23e259
Reported-by: Eddi De Pieri
Signed-off-by: Andrej Krutak
Signed-off-by: Takashi Iwai
26 Sep, 2016
1 commit
-
Currently, usb-line6 module exports an array of MIDI manufacturer ID and
usb-pod module uses it. However, the declaration is not the definition in
common header. The difference is explicit length of array. Although
compiler calculates it and everything goes well, it's better to use the
same representation between definition and declaration.This commit fills the length of array for usb-line6 module. As a small
good sub-effect, this commit suppress below warnings from static analysis
by sparse v0.5.0.sound/usb/line6/driver.c:274:43: error: cannot size expression
sound/usb/line6/driver.c:275:16: error: cannot size expression
sound/usb/line6/driver.c:276:16: error: cannot size expression
sound/usb/line6/driver.c:277:16: error: cannot size expressionFixes: 705ececd1c60 ("Staging: add line6 usb driver")
Signed-off-by: Takashi Sakamoto
Signed-off-by: Takashi Iwai
21 Sep, 2016
1 commit
-
ERROR: "snd_hwdep_new" [sound/usb/line6/snd-usb-line6.ko] undefined!
scripts/Makefile.modpost:91: recipe for target '__modpost' failed
make[1]: *** [__modpost] Error 1Fixes: a16039cbf1a1 ('ALSA: line6: Add hwdep interface to access the POD control messages')
Signed-off-by: Valdis Kletnieks
Reviewed-by: Takashi Sakamoto
Signed-off-by: Takashi Iwai
20 Sep, 2016
13 commits
-
sound/usb/line6/driver.c:484:2-7: WARNING: NULL check before freeing functions like kfree, debugfs_remove, debugfs_remove_recursive or usb_free_urb is not needed. Maybe consider reorganizing relevant code to avoid passing NULL values.
NULL check before some freeing functions is not needed.
Based on checkpatch warning
"kfree(NULL) is safe this check is probably not required"
and kfreeaddr.cocci by Julia Lawall.Generated by: scripts/coccinelle/free/ifnullfree.cocci
CC: Andrej Krutak
Signed-off-by: Fengguang Wu
Signed-off-by: Takashi Iwai -
We must do it this way, because e.g. POD X3 won't play any sound unless
the host listens on the bulk EP, so we cannot export it only via libusb.The driver currently doesn't use the bulk EP messages in other way,
in future it could e.g. sense/modify volume(s).Signed-off-by: Andrej Krutak
Signed-off-by: Takashi Iwai -
Only initialize PCM for POD HD devices that support it.
No POD HD seems to support MIDI, thus drop the initialization.Signed-off-by: Andrej Krutak
Signed-off-by: Takashi Iwai -
Not all line6 devices use the control port.
Signed-off-by: Andrej Krutak
Signed-off-by: Takashi Iwai -
Signed-off-by: Andrej Krutak
Signed-off-by: Takashi Iwai -
This includes audio in/out and basic initialization via control EP (emulates
what original driver does). The initialization is done similarly to original
POD, firmware and serial IDs are read and exported via sysfs.Signed-off-by: Andrej Krutak
Signed-off-by: Takashi Iwai -
Not all PODs use MIDI via USB data interface, thus allow avoiding
that code and instead using direct processing.Signed-off-by: Andrej Krutak
Signed-off-by: Takashi Iwai -
POD X3 can initialize similarly to older PODs, but it doesn't have the MIDI
interface. Instead, configuration is done via proprietary bulk EP messages.Signed-off-by: Andrej Krutak
Signed-off-by: Takashi Iwai -
E.g. POD X3 seems to require playback data to be sent to it to generate
capture data. Otherwise the device stalls and doesn't send any more capture
data until it's reset.Signed-off-by: Andrej Krutak
Signed-off-by: Takashi Iwai -
Changes bytes_per_frame to bytes_per_channel.
Signed-off-by: Andrej Krutak
Signed-off-by: Takashi Iwai -
Splits max_packet_size to max_packet_size_in/out (e.g. for
different channel counts).Signed-off-by: Andrej Krutak
Signed-off-by: Takashi Iwai -
This has two parts:
* intervals_per_second setup
(high speed needs 8000, instead of 1000)
* iso_buffers setup (count of iso buffers depends on
USB speed, 2 is not enough for high speed)Signed-off-by: Andrej Krutak
Signed-off-by: Takashi Iwai -
This basically changes LINE6_ISO_BUFFERS constant to a configurable
iso_buffers property.Signed-off-by: Andrej Krutak
Signed-off-by: Takashi Iwai
22 Aug, 2016
3 commits
-
The commit 02fc76f6a changed base of the sysfs attributes from device to card.
The "show" callbacks dereferenced wrong objects because of this.Fixes: 02fc76f6a7db ('ALSA: line6: Create sysfs via snd_card_add_dev_attr()')
Cc: # v4.0+
Reviewed-by: Stefan Hajnoczi
Signed-off-by: Andrej Krutak
Signed-off-by: Takashi Iwai -
Done, because line6_stream_stop() locks and calls line6_unlink_audio_urbs(),
which in turn invokes audio_out_callback(), which tries to lock 2nd time.Fixes:
=============================================
[ INFO: possible recursive locking detected ]
4.4.15+ #15 Not tainted
---------------------------------------------
mplayer/3591 is trying to acquire lock:
(&(&line6pcm->out.lock)->rlock){-.-...}, at: [] audio_out_callback+0x70/0x110 [snd_usb_line6]but task is already holding lock:
(&(&line6pcm->out.lock)->rlock){-.-...}, at: [] line6_stream_stop+0x24/0x5c [snd_usb_line6]other info that might help us debug this:
Possible unsafe locking scenario:CPU0
----
lock(&(&line6pcm->out.lock)->rlock);
lock(&(&line6pcm->out.lock)->rlock);*** DEADLOCK ***
May be due to missing lock nesting notation
3 locks held by mplayer/3591:
#0: (snd_pcm_link_rwlock){.-.-..}, at: [] snd_pcm_stream_lock+0x1e/0x40 [snd_pcm]
#1: (&(&substream->self_group.lock)->rlock){-.-...}, at: [] snd_pcm_stream_lock+0x26/0x40 [snd_pcm]
#2: (&(&line6pcm->out.lock)->rlock){-.-...}, at: [] line6_stream_stop+0x24/0x5c [snd_usb_line6]stack backtrace:
CPU: 0 PID: 3591 Comm: mplayer Not tainted 4.4.15+ #15
Hardware name: Generic AM33XX (Flattened Device Tree)
[] (unwind_backtrace) from [] (show_stack+0x11/0x14)
[] (show_stack) from [] (dump_stack+0x8b/0xac)
[] (dump_stack) from [] (__lock_acquire+0xc8b/0x1780)
[] (__lock_acquire) from [] (lock_acquire+0x99/0x1c0)
[] (lock_acquire) from [] (_raw_spin_lock_irqsave+0x3f/0x4c)
[] (_raw_spin_lock_irqsave) from [] (audio_out_callback+0x70/0x110 [snd_usb_line6])
[] (audio_out_callback [snd_usb_line6]) from [] (__usb_hcd_giveback_urb+0x53/0xd0)
[] (__usb_hcd_giveback_urb) from [] (musb_giveback+0x3d/0x98)
[] (musb_giveback) from [] (musb_urb_dequeue+0x6d/0x114)
[] (musb_urb_dequeue) from [] (usb_hcd_unlink_urb+0x39/0x98)
[] (usb_hcd_unlink_urb) from [] (line6_unlink_audio_urbs+0x6a/0x6c [snd_usb_line6])
[] (line6_unlink_audio_urbs [snd_usb_line6]) from [] (line6_stream_stop+0x42/0x5c [snd_usb_line6])
[] (line6_stream_stop [snd_usb_line6]) from [] (snd_line6_trigger+0xb6/0xf4 [snd_usb_line6])
[] (snd_line6_trigger [snd_usb_line6]) from [] (snd_pcm_do_stop+0x36/0x38 [snd_pcm])
[] (snd_pcm_do_stop [snd_pcm]) from [] (snd_pcm_action_single+0x22/0x40 [snd_pcm])
[] (snd_pcm_action_single [snd_pcm]) from [] (snd_pcm_action+0xac/0xb0 [snd_pcm])
[] (snd_pcm_action [snd_pcm]) from [] (snd_pcm_drop+0x38/0x64 [snd_pcm])
[] (snd_pcm_drop [snd_pcm]) from [] (snd_pcm_common_ioctl1+0x7fe/0xbe8 [snd_pcm])
[] (snd_pcm_common_ioctl1 [snd_pcm]) from [] (snd_pcm_playback_ioctl1+0x15c/0x51c [snd_pcm])
[] (snd_pcm_playback_ioctl1 [snd_pcm]) from [] (snd_pcm_playback_ioctl+0x20/0x28 [snd_pcm])
[] (snd_pcm_playback_ioctl [snd_pcm]) from [] (do_vfs_ioctl+0x3af/0x5c8)Fixes: 63e20df1e5b2 ('ALSA: line6: Reorganize PCM stream handling')
Cc: # v4.0+
Reviewed-by: Stefan Hajnoczi
Signed-off-by: Andrej Krutak
Signed-off-by: Takashi Iwai -
If there's an error, pcm is released in line6_pcm_acquire already.
Fixes: 247d95ee6dd2 ('ALSA: line6: Handle error from line6_pcm_acquire()')
Cc: # v4.0+
Reviewed-by: Stefan Hajnoczi
Signed-off-by: Andrej Krutak
Signed-off-by: Takashi Iwai
14 Jul, 2015
1 commit
-
When a monitor stream is active, the next PCM stream access results in
EBUSY error because of the check in line6_stream_start(). Fix this by
just skipping the submission of pending URBs when the stream is
already running instead.Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=101431
Cc: # v4.0+
Signed-off-by: Takashi Iwai
05 Mar, 2015
1 commit
-
The usages of clamp() macro in sound/usb/line6/playback.c are just
wrong, the low and high values are swapped.Reported-by: Dan Carpenter
Signed-off-by: Takashi Iwai
12 Feb, 2015
1 commit
-
The address cannot be negative so make it unsigned. Also, an unsigned
int is always sufficient for the length, so no need to overdo it with a
size_t. Finally, add in range checks to see if the values passed in
actually fit where they are used.Signed-off-by: Chris Rorvick
Signed-off-by: Takashi Iwai
11 Feb, 2015
5 commits
-
The firmware version is a single byte so have the variable type agree.
Since the address to this member is passed to the read function, using
an int is not even portable.Signed-off-by: Chris Rorvick
Signed-off-by: Takashi Iwai -
The serial number (aka ESN) is a 32-bit value.
Signed-off-by: Chris Rorvick
Signed-off-by: Takashi Iwai -
Signed-off-by: Chris Rorvick
Signed-off-by: Takashi Iwai -
Put an upper bound on how long we will wait for the device to respond to
a read/write request (i.e., 100 milliseconds) and return an error if
this is reached.Signed-off-by: Chris Rorvick
Signed-off-by: Takashi Iwai -
The device indicates the result of a read/write operation by making the
status available on a subsequent request from the driver. This is not
ready immediately, though, so the driver is currently slamming the
device with hundreds of pointless requests before getting the expected
response. Add a two millisecond delay before each attempt. This is
approximately the behavior observed with version 4.2.7.1 of the Windows
driver.Signed-off-by: Chris Rorvick
Signed-off-by: Takashi Iwai
08 Feb, 2015
3 commits
-
Provide a unique name for each driver instead of using "line6usb" for
all of them. This will allow for different configurations based on the
driver type.Signed-off-by: Chris Rorvick
Signed-off-by: Takashi Iwai -
It is unlikely this function would ever be used in a context without a
pointer to a `struct usb_line6_toneport', so grab the device type from
it rather than having the caller do it.Signed-off-by: Chris Rorvick
Signed-off-by: Takashi Iwai -
Add a predicate for testing if the device supports source selection to
make the conditional logic around this a bit cleaner.Signed-off-by: Chris Rorvick
Signed-off-by: Takashi Iwai
06 Feb, 2015
2 commits
-
Signed-off-by: Takashi Iwai
-
Use the new helper function to create sysfs entries in the card more
gracefully without races.Signed-off-by: Takashi Iwai
03 Feb, 2015
2 commits
-
line6_start_timer passes an unsigned int as argument to be used in mod_timer
which is then used by mod_timer as unsigned long, this just fixes up the
argument type. This change helps make static code checkers happy.Signed-off-by: Nicholas Mc Guire
Signed-off-by: Takashi Iwai -
This is only an API consolidation and should make things more readable
it replaces var * HZ / 1000 by msecs_to_jiffies(var).Signed-off-by: Nicholas Mc Guire
Signed-off-by: Takashi Iwai
01 Feb, 2015
2 commits
-
Use of this function ended with commits 3e58c868db1d ("staging: line6:
drop midi_mask_receive") and af89d2897a71 ("staging: line6: drop
midi_mask_transmit".)[Removed the corresponding line in midibuf.h, too -- tiwai]
Signed-off-by: Chris Rorvick
Signed-off-by: Takashi Iwai -
This function has not been used since merging the driver into the kernel
(and a good while before that.)[Removed the corresponding line in midibuf.h, too -- tiwai]
Signed-off-by: Chris Rorvick
Signed-off-by: Takashi Iwai
29 Jan, 2015
2 commits
-
It's just superfluous and doesn't give any better readability.
Signed-off-by: Takashi Iwai
-
PODxt Live Variax doesn't have PCM and HWMON but only MIDI.
Signed-off-by: Takashi Iwai