aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-07-15ALSA: Kconfig: SND_AC97_POWER_SAVE description improvementMichael Witten1-3/+21
The description has been expanded to explain the time-out value provided by the power_save module parameter. Signed-off-by: Michael Witten <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2010-07-14sound/oss-msnd-pinnacle: ioctl needs the inodeArnd Bergmann1-1/+1
This broke in sound/oss: convert to unlocked_ioctl, when I missed one of the ioctl functions still using the inode pointer. Signed-off-by: Arnd Bergmann <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2010-07-12sound/oss: convert to unlocked_ioctlArnd Bergmann6-51/+119
These are the final conversions for the ioctl file operation so we can remove it in the next merge window. Signed-off-by: Arnd Bergmann <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2010-07-12sound: push BKL into open functionsArnd Bergmann9-35/+95
This moves the lock_kernel() call from soundcore_open to the individual OSS device drivers, where we can deal with it one driver at a time if needed, or just kill off the drivers. All core components in ALSA already provide adequate locking in their open()-functions and do not require the big kernel lock, so there is no need to add the BKL there. Signed-off-by: Arnd Bergmann <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2010-07-12ALSA: via82xx: allow changing the initial DXS volumeClemens Ladisch1-2/+7
As per-stream volume controls, the DXS controls are not intended to adjust the overall sound level and so are initialized every time a stream is opened. However, there are special situations where one wants to reduce the overall volume in the digital domain, i.e., before the AC'97 codec's PCM volume control. To allow this, add a module parameter that sets the initial DXS volume. Signed-off-by: Clemens Ladisch <[email protected]> Tested-by: Soeren D. Schulze <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2010-07-09ALSA: usb-audio: silence a superfluous warningClemens Ladisch1-4/+1
It is not advisable to print a warning when a device does not support setting the sample rate because this is perfectly valid for devices with a single rate or where rates are implicitly changed by selecting another alternate setting. Signed-off-by: Clemens Ladisch <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2010-07-08ALSA: Update documents about new bits of xrun_debug proc fileTakashi Iwai1-0/+8
Signed-off-by: Takashi Iwai <[email protected]>
2010-07-06ALSA: asihpi - Remove unneeded ;Eliot Blennerhassett1-1/+1
Signed-off-by: Eliot Blennerhassett <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2010-07-06ALSA: asihpi - Minor HPI error handling fixesEliot Blennerhassett1-2/+8
Handle errors in tuner level caching, Ccorrect error code for aesebu rx status. Signed-off-by: Eliot Blennerhassett <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2010-07-06ALSA: asihpi - Change compander API and tidyEliot Blennerhassett2-143/+211
Compander API changed to one function per parameter. Factor out some common code for stereo log value reading. Make some more entity functions static. Signed-off-by: Eliot Blennerhassett <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2010-07-06ALSA: asihpi - Add ASI5200 familyEliot Blennerhassett1-0/+7
Signed-off-by: Eliot Blennerhassett <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2010-07-06ALSA: asihpi - Use version string instead of printf formattingEliot Blennerhassett1-3/+1
Signed-off-by: Eliot Blennerhassett <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2010-07-06ALSA: asihpi - HPI API updatesEliot Blennerhassett3-27/+55
Remove some deprecated items. Change compander api to one function per parameter. Add a version string define. Signed-off-by: Eliot Blennerhassett <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2010-07-05soundcore_open: Reduce the area BKL coverageJohn Kacur1-5/+8
Most of this function is protected by the sound_loader_lock. We can push down the BKL to this call out err = file->f_op->open(inode,file); In order to build the sound core without the BKL, we will need to push the lock_kernel() call into the ~20 device drivers that register their file operations. Signed-off-by: John Kacur <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]> Acked-by: Alan Cox <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2010-07-05Merge branch 'devel' of git://git.alsa-project.org/alsa-kernel into topic/miscTakashi Iwai3-16/+25
2010-06-28sis7019: increase reset delaysDavid Dillow1-3/+3
A few boards using this controller are reported to need a little extra time during their reset cycle. Reported-by: Michael Goeke <[email protected]> Signed-off-by: Dave Dillow <[email protected]> Signed-off-by: Jaroslav Kysela <[email protected]>
2010-06-28sis7019: fix capture issues with multiple periods per bufferDavid Dillow1-4/+6
When using a timing voice to clock out periods during capture, the driver would slowly loose synchronization and never catch up, eventually reaching a point where it no longer generated interrupts. To avoid this situation, the virtual period clocking was changed to shorten the next timing period when our timing voice falls too far behind the capture voice. In addition, the first virtual period for the timing voice was slightly too short, causing the timing voice to initially be ahead of the capture voice. While tracking down this problem, I noticed that the expected sample offset was being incorrectly initialized, causing an overrun to be incorrectly reported when the timing voice happened to be perfectly synchronized. Reported-by: Hans Schou <[email protected]> Signed-off-by: Dave Dillow <[email protected]> Signed-off-by: Jaroslav Kysela <[email protected]>
2010-06-28ALSA: pcm_lib: avoid timing jitter in snd_pcm_read/write()David Dillow2-9/+16
When using poll() to wait for the next period -- or avail_min samples -- one gets a consistent delay for each system call that is usually just a little short of the selected period time. However, When using snd_pcm_read/write(), one gets a jittery delay that alternates between less than a millisecond and approximately two period times. This is caused by snd_pcm_lib_{read,write}1() transferring any available samples to the user's buffer and adjusting the application pointer prior to sleeping to the end of the current period. When the next period interrupt occurs, there is then less than avail_min samples remaining to be transferred in the period, so we end up sleeping until a second period occurs. This is solved by using runtime->twake as the number of samples needed for a wakeup in addition to selecting the proper wait queue to wake in snd_pcm_update_state(). This requires twake to be non-zero when used by snd_pcm_lib_{read,write}1() even if avail_min is zero. Signed-off-by: Dave Dillow <[email protected]> Signed-off-by: Jaroslav Kysela <[email protected]>
2010-06-24ALSA: usb - Fix compile error with CONFIG_SND_DEBUG_VERBOSE=yTakashi Iwai1-1/+1
Replaced the forgotten cval->mixer->ctrlif. Signed-off-by: Takashi Iwai <[email protected]>
2010-06-23ALSA: usb-audio: simplify control interface accessDaniel Mack8-44/+34
As the control interface is now carried in struct snd_usb_audio, we can simplify the API a little and also drop the private ctrlif field from struct usb_mixer_interface. Also remove a left-over function prototype in pcm.h. Signed-off-by: Daniel Mack <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2010-06-23ALSA: usb-audio: move and add some commentsDaniel Mack3-10/+45
Also add a list of open topics. Signed-off-by: Daniel Mack <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2010-06-23ALSA: usb-midi: whitespace fixesDaniel Mack1-7/+7
Signed-off-by: Daniel Mack <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2010-06-23ALSA: usb-audio: unify UAC macros and struct namesDaniel Mack7-21/+21
Get rid of the last occurances of _v1 suffixes, and move the version number right after the "uac" string. Now things are consitent again. Sorry for the forth and back, but it just looks much nicer this way. Signed-off-by: Daniel Mack <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2010-06-23ALSA: usb-audio: clean up includes in clock.cDaniel Mack1-15/+1
Signed-off-by: Daniel Mack <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2010-06-23Merge branch 'fix/misc' into topic/miscTakashi Iwai905-7102/+82138
2010-06-23ALSA: usb-audio - Add volume resolution quirk for some Logitech webcamsAlexey Fisher1-0/+13
Some programs like Skype trying to set capture volume automatically. Normally it will tray, carefully step by step lover or higher, set the volume. In real word it work not really well, because devises and vendors lie about real audio settings. For example most Logitech webcams have 6400 or 3500 steps for capture volume. They do not tell that actual resolution is 384. So we have only 7 or 18 real steps. In this patch I set real resolution only for tested devices. Signed-off-by: Alexey Fisher <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2010-06-21ALSA: usb/endpoint, fix dangling pointer useJiri Slaby1-0/+1
Stanse found that in snd_usb_parse_audio_endpoints, there is a dangling pointer dereference. When snd_usb_parse_audio_format fails, fp is freed, and continue invoked. On the next loop, there is "fp && fp->altsetting == 1 && fp->channels == 1" test, but fp is set from the last iteration (but is bogus) and thus ilegally dereferenced. Set fp to NULL before "continue". Signed-off-by: Jiri Slaby <[email protected]> Acked-by: Daniel Mack <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2010-06-17ALSA: alsa: riptide: don't use own hex_to_bin() methodAndy Shevchenko1-6/+6
Signed-off-by: Andy Shevchenko <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2010-06-17ALSA: asihpi - Get rid of incorrect "long" types and casts.Eliot Blennerhassett1-11/+11
These give incorrect results for index wrap on 64 bit. Signed-off-by: Eliot Blennerhassett <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2010-06-11ALSA: usb-audio: fix UAC2 control value queriesDaniel Mack1-5/+14
For RANGE requests, we should only query as much bytes as we're in fact interested in. For CUR requests, we shouldn't confuse the firmware with an overlong request but just ask for 2 bytes. This might need fixing in the future as it's not entirely clear when to dispatch 1-byte, 2-byte and 4-byte request blocks. For now, we assume everything is coded in 16bit - this works for all firmware implementations I've seen. Signed-off-by: Daniel Mack <[email protected]> Reported-by: Alex Lee <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2010-06-11ALSA: usb-audio: parse UAC2 sample rate ranges correctlyDaniel Mack1-18/+74
A device may report its supported sample rates in ranges rather than in discrete triplets. The code used to only parse the MIN field instead of properly paying attention to the MAX and RES values. Also, handle RES values of 1 correctly and announce a continous sample rate range in this case. Signed-off-by: Daniel Mack <[email protected]> Reported-by: Alex Lee <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2010-06-11ALSA: usb-audio: fix control messages for USB_RECIP_INTERFACEDaniel Mack3-6/+16
Control messages directed to an interface must have the interface number set in the lower 8 bits of wIndex. This wasn't done correctly for some clock and mixer messages. Signed-off-by: Daniel Mack <[email protected]> Reported-by: Alex Lee <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2010-06-11ALSA: usb-audio: add check for faulty clock in parse_audio_format_rates_v2()Daniel Mack1-0/+6
Signed-off-by: Daniel Mack <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2010-06-08ALSA: sound/spi: patch for the unuseful variable removalWan ZongShun1-1/+0
The '*bitclk' of structure 'snd_at73c213' seems no use, so I make a patch to remove the unnecessary variable. Signed-off-by: Wan ZongShun <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2010-06-08ALSA: atmel: set "channel A event" output to debugYegor Yefremov1-1/+1
Signed-off-by: Yegor Yefremov <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2010-06-08sound: move driver parameters to their own filesRandy Dunlap3-161/+192
Move sound (OSS & ALSA) kernel parameters to their own files. Signed-off-by: Randy Dunlap <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2010-06-05Linux 2.6.35-rc2Linus Torvalds1-1/+1
2010-06-05drm/i915: Move non-phys cursors into the GTTChris Wilson1-0/+9
Cursors need to be in the GTT domain when being accessed by the GPU. Previously this was a fortuitous byproduct of userspace using pwrite() to upload the image data into the cursor. The redundant clflush was removed in commit 9b8c4a and so the image was no longer being flushed out of the caches into main memory. One could also devise a scenario where the cursor was rendered by the GPU, prior to being attached as the cursor, resulting in similar corruption due to the missing MI_FLUSH. Fixes: Bug 28335 - Cursor corruption caused by commit 9b8c4a0b21 https://bugs.freedesktop.org/show_bug.cgi?id=28335 Signed-off-by: Chris Wilson <[email protected]> Reported-and-tested-by: Jeff Chua <[email protected]> Tested-by: Linus Torvalds <[email protected]> Reported-by: Andy Isaacson <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-06-05Merge branch 'for_linus' of ↵Linus Torvalds2-17/+26
git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: ext4: Fix remaining racy updates of EXT4_I(inode)->i_flags ext4: Make sure the MOVE_EXT ioctl can't overwrite append-only files
2010-06-05ext4: Fix remaining racy updates of EXT4_I(inode)->i_flagsDmitry Monakhov1-17/+23
A few functions were still modifying i_flags in a racy manner. Signed-off-by: Dmitry Monakhov <[email protected]> Signed-off-by: "Theodore Ts'o" <[email protected]>
2010-06-05Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfsLinus Torvalds18-798/+736
* 'for-linus' of git://oss.sgi.com/xfs/xfs: xfs: improve xfs_isilocked xfs: skip writeback from reclaim context xfs: remove done roadmap item from xfs-delayed-logging-design.txt xfs: fix race in inode cluster freeing failing to stale inodes xfs: fix access to upper inodes without inode64 xfs: fix might_sleep() warning when initialising per-ag tree fs/xfs/quota: Add missing mutex_unlock xfs: remove duplicated #include xfs: convert more trace events to DEFINE_EVENT xfs: xfs_trace.c: remove duplicated #include xfs: Check new inode size is OK before preallocating xfs: clean up xlog_align xfs: cleanup log reservation calculactions xfs: be more explicit if RT mount fails due to config xfs: replace E2BIG with EFBIG where appropriate
2010-06-05Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds31-205/+256
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (30 commits) X25: remove duplicated #include tcp: use correct net ns in cookie_v4_check() rps: tcp: fix rps_sock_flow_table table updates ppp_generic: fix multilink fragment sizes syncookies: remove Kconfig text line about disabled-by-default ixgbe: only check pfc bits in hang logic if pfc is enabled net: check for refcount if pop a stacked dst_entry ixgbe: return IXGBE_ERR_RAR_INDEX when out of range act_pedit: access skb->data safely sfc: Store port number in net_device::dev_id epic100: Test __BIG_ENDIAN instead of (non-existent) CONFIG_BIG_ENDIAN tehuti: return -EFAULT on copy_to_user errors isdn/kcapi: return -EFAULT on copy_from_user errors e1000e: change logical negate to bitwise sfc: Get port number from CS_PORT_NUM, not PCI function number cls_u32: use skb_header_pointer() to dereference data safely TCP: tcp_hybla: Fix integer overflow in slow start increment act_nat: fix the wrong checksum when addr isn't in old_addr/mask net/fec: fix pm to survive to suspend/resume korina: count RX DMA OVR as rx_fifo_error ...
2010-06-05Merge branch 'for-linus' of ↵Linus Torvalds4-10/+4
git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2: nilfs2: remove obsolete declarations of cache constructor and destructor nilfs2: fix style issue in nilfs_destroy_cachep
2010-06-04Merge branch 'for-linus' of ↵Linus Torvalds8-15/+13
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: Minix: Clean up left over label fix truncate inode time modification breakage fix setattr error handling in sysfs, configfs fcntl: return -EFAULT if copy_to_user fails wrong type for 'magic' argument in simple_fill_super() fix the deadlock in qib_fs mqueue doesn't need make_bad_inode()
2010-06-04Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linusLinus Torvalds3-155/+221
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: module: fix bne2 "gave up waiting for init of module libcrc32c" module: verify_export_symbols under the lock module: move find_module check to end module: make locking more fine-grained. module: Make module sysfs functions private. module: move sysfs exposure to end of load_module module: fix kdb's illicit use of struct module_use. module: Make the 'usage' lists be two-way
2010-06-05module: fix bne2 "gave up waiting for init of module libcrc32c"Rusty Russell1-32/+59
Problem: it's hard to avoid an init routine stumbling over a request_module these days. And it's not clear it's always a bad idea: for example, a module like kvm with dynamic dependencies on kvm-intel or kvm-amd would be neater if it could simply request_module the right one. In this particular case, it's libcrc32c: libcrc32c_mod_init crypto_alloc_shash crypto_alloc_tfm crypto_find_alg crypto_alg_mod_lookup crypto_larval_lookup request_module If another module is waiting inside resolve_symbol() for libcrc32c to finish initializing (ie. bne2 depends on libcrc32c) then it does so holding the module lock, and our request_module() can't make progress until that is released. Waiting inside resolve_symbol() without the lock isn't all that hard: we just need to pass the -EBUSY up the call chain so we can sleep where we don't hold the lock. Error reporting is a bit trickier: we need to copy the name of the unfinished module before releasing the lock. Other notes: 1) This also fixes a theoretical issue where a weak dependency would allow symbol version mismatches to be ignored. 2) We rename use_module to ref_module to make life easier for the only external user (the out-of-tree ksplice patches). Signed-off-by: Rusty Russell <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Tim Abbot <[email protected]> Tested-by: Brandon Philips <[email protected]>
2010-06-05module: verify_export_symbols under the lockRusty Russell1-16/+10
It disabled preempt so it was "safe", but nothing stops another module slipping in before this module is added to the global list now we don't hold the lock the whole time. So we check this just after we check for duplicate modules, and just before we put the module in the global list. (find_symbol finds symbols in coming and going modules, too). Signed-off-by: Rusty Russell <[email protected]>
2010-06-05module: move find_module check to endLinus Torvalds1-5/+7
I think Rusty may have made the lock a bit _too_ finegrained there, and didn't add it to some places that needed it. It looks, for example, like PATCH 1/2 actually drops the lock in places where it's needed ("find_module()" is documented to need it, but now load_module() didn't hold it at all when it did the find_module()). Rather than adding a new "module_loading" list, I think we should be able to just use the existing "modules" list, and just fix up the locking a bit. In fact, maybe we could just move the "look up existing module" a bit later - optimistically assuming that the module doesn't exist, and then just undoing the work if it turns out that we were wrong, just before adding ourselves to the list. Signed-off-by: Rusty Russell <[email protected]>
2010-06-05module: make locking more fine-grained.Rusty Russell1-23/+42
Kay Sievers <[email protected]> reports that we still have some contention over module loading which is slowing boot. Linus also disliked a previous "drop lock and regrab" patch to fix the bne2 "gave up waiting for init of module libcrc32c" message. This is more ambitious: we only grab the lock where we need it. Signed-off-by: Rusty Russell <[email protected]> Cc: Brandon Philips <[email protected]> Cc: Kay Sievers <[email protected]> Cc: Linus Torvalds <[email protected]>
2010-06-05module: Make module sysfs functions private.Rusty Russell2-37/+25
These were placed in the header in ef665c1a06 to get the various SYSFS/MODULE config combintations to compile. That may have been necessary then, but it's not now. These functions are all local to module.c. Signed-off-by: Rusty Russell <[email protected]> Cc: Randy Dunlap <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.