aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-10-30ALSA: Avoid endless sleep after disconnectTakashi Iwai6-1/+46
When disconnect callback is called, each component should wake up sleepers and check card->shutdown flag for avoiding the endless sleep blocking the proper resource release. Cc: <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2012-10-30ALSA: Add a reference counter to card instanceTakashi Iwai11-32/+86
For more strict protection for wild disconnections, a refcount is introduced to the card instance, and let it up/down when an object is referred via snd_lookup_*() in the open ops. The free-after-last-close check is also changed to check this refcount instead of the empty list, too. Reported-by: Matthieu CASTET <[email protected]> Cc: <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2012-10-30ALSA: usb-audio: Fix races at disconnection in mixer_quirks.cTakashi Iwai1-7/+51
Similar like the previous commit, cover with chip->shutdown_rwsem and chip->shutdown checks. Reported-by: Matthieu CASTET <[email protected]> Cc: <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2012-10-30ALSA: usb-audio: Use rwsem for disconnect protectionTakashi Iwai4-17/+21
Replace mutex with rwsem for codec->shutdown protection so that concurrent accesses are allowed. Also add the protection to snd_usb_autosuspend() and snd_usb_autoresume(), too. Reported-by: Matthieu CASTET <[email protected]> Cc: <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2012-10-30ALSA: usb-audio: Fix races at disconnectionTakashi Iwai5-41/+79
Close some races at disconnection of a USB audio device by adding the chip->shutdown_mutex and chip->shutdown check at appropriate places. The spots to put bandaids are: - PCM prepare, hw_params and hw_free - where the usb device is accessed for communication or get speed, in mixer.c and others; the device speed is now cached in subs->speed instead of accessing to chip->dev The accesses in PCM open and close don't need the mutex protection because these are already handled in the core PCM disconnection code. The autosuspend/autoresume codes are still uncovered by this patch because of possible mutex deadlocks. They'll be covered by the upcoming change to rwsem. Also the mixer codes are untouched, too. These will be fixed in another patch, too. Reported-by: Matthieu CASTET <[email protected]> Cc: <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2012-10-30ALSA: PCM: Fix some races at disconnectionTakashi Iwai2-5/+18
Fix races at PCM disconnection: - while a PCM device is being opened or closed - while the PCM state is being changed without lock in prepare, hw_params, hw_free ops Reported-by: Matthieu CASTET <[email protected]> Cc: <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2012-10-30loop: Make explicit loop device destruction lazyDave Chinner1-2/+15
xfstests has always had random failures of tests due to loop devices failing to be torn down and hence leaving filesytems that cannot be unmounted. This causes test runs to immediately stop. Over the past 6 or 7 years we've added hacks like explicit unmount -d commands for loop mounts, losetup -d after unmount -d fails, etc, but still the problems persist. Recently, the frequency of loop related failures increased again to the point that xfstests 259 will reliably fail with a stray loop device that was not torn down. That is despite the fact the test is above as simple as it gets - loop 5 or 6 times running mkfs.xfs with different paramters: lofile=$(losetup -f) losetup $lofile "$testfile" "$MKFS_XFS_PROG" -b size=512 $lofile >/dev/null || echo "mkfs failed!" sync losetup -d $lofile And losteup -d $lofile is failing with EBUSY on 1-3 of these loops every time the test is run. Turns out that blkid is running simultaneously with losetup -d, and so it sees an elevated reference count and returns EBUSY. But why is blkid running? It's obvious, isn't it? udev has decided to try and find out what is on the block device as a result of a creation notification. And it is racing with mkfs, so might still be scanning the device when mkfs finishes and we try to tear it down. So, make losetup -d force autoremove behaviour. That is, when the last reference goes away, tear down the device. xfstests wants it *gone*, not causing random teardown failures when we know that all the operations the tests have specifically run on the device have completed and are no longer referencing the loop device. Signed-off-by: Dave Chinner <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2012-10-30mtip32xx:Added appropriate timeout value for secure eraseSelvan Mani2-4/+18
Added appropriate timeout value for secure erase based on identify device data Signed-off-by: Asai Thambi S P <[email protected]> Signed-off-by: Selvan Mani <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2012-10-30xen/blkback: Change xen_vbd's flush_support and discard_secure to have type ↵Oliver Chick1-2/+2
unsigned int, rather than bool Changing the type of bdev parameters to be unsigned int :1, rather than bool. This is more consistent with the types of other features in the block drivers. Signed-off-by: Oliver Chick <[email protected]> Signed-off-by: Konrad Rzeszutek Wilk <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2012-10-30cciss: select CONFIG_CHECK_SIGNATUREAkinobu Mita1-0/+1
The patch cciss-use-check_signature.patch in -mm tree introduced a build error: drivers/built-in.o: In function `CISS_signature_present': drivers/block/cciss.c:4270: undefined reference to `check_signature' Add missing CONFIG_CHECK_SIGNATURE to fix this issue. Reported-by: Fengguang Wu <[email protected]> Signed-off-by: Akinobu Mita <[email protected]> Cc: Fengguang Wu <[email protected]> Cc: Mike Miller <[email protected]> Cc: Jens Axboe <[email protected]> Acked-by: "Stephen M. Cameron" <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2012-10-30cciss: remove unneeded memset()Wei Yongjun1-1/+0
The memory return by kzalloc() or kmem_cache_zalloc() has already be set to zero, so remove useless memset(0). spatch with a semantic match is used to found this problem. (http://coccinelle.lip6.fr/) Signed-off-by: Wei Yongjun <[email protected]> Cc: Mike Miller <[email protected]> Cc: Jens Axboe <[email protected]> Cc: Stephen M. Cameron <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2012-10-30xen/blkback: use kmem_cache_zalloc instead of kmem_cache_alloc/memsetWei Yongjun1-2/+1
Using kmem_cache_zalloc() instead of kmem_cache_alloc() and memset(). spatch with a semantic match is used to found this problem. (http://coccinelle.lip6.fr/) Signed-off-by: Wei Yongjun <[email protected]> Signed-off-by: Konrad Rzeszutek Wilk <[email protected]>
2012-10-30pktcdvd: update MAINTAINERSJiri Kosina1-1/+1
Peter is not going to maintain the driver any more. I have the hardware. Acked-by: Peter Osterlund <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
2012-10-30floppy: remove dr, reuse drive on do_floppy_initHerton Ronaldo Krzesinski1-26/+22
This is a small cleanup, that also may turn error handling of unitialized disks more readable. We don't need a separate variable to track allocated disks, remove dr and reuse drive variable instead. Signed-off-by: Herton Ronaldo Krzesinski <[email protected]> Signed-off-by: Jiri Kosina <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2012-10-30floppy: use common function to check if floppies can be registeredHerton Ronaldo Krzesinski1-10/+13
The same checks to see if a drive can be or is registered are repeated through the code, factor out the checks in a common function and replace the repeated checks with it. Signed-off-by: Herton Ronaldo Krzesinski <[email protected]> Signed-off-by: Jiri Kosina <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2012-10-30floppy: properly handle failure on add_disk loopHerton Ronaldo Krzesinski1-1/+10
On floppy initialization, if something failed inside the loop we call add_disk, there was no cleanup of previous iterations in the error handling. Cc: [email protected] Signed-off-by: Herton Ronaldo Krzesinski <[email protected]> Signed-off-by: Jiri Kosina <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2012-10-30floppy: do put_disk on current dr if blk_init_queue failsHerton Ronaldo Krzesinski1-0/+1
If blk_init_queue fails, we do not call put_disk on the current dr (dr is decremented first in the error handling loop). Cc: [email protected] Reviewed-by: Ben Hutchings <[email protected]> Signed-off-by: Herton Ronaldo Krzesinski <[email protected]> Signed-off-by: Jiri Kosina <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2012-10-30floppy: don't call alloc_ordered_workqueue inside the alloc_disk loopHerton Ronaldo Krzesinski1-9/+6
Since commit 070ad7e ("floppy: convert to delayed work and single-thread wq"), we end up calling alloc_ordered_workqueue multiple times inside the loop, which shouldn't be intended. Besides the leak, other side effect in the current code is if blk_init_queue fails, we would end up calling unregister_blkdev even if we didn't call yet register_blkdev. Just moved the allocation of floppy_wq before the loop, and adjusted the code accordingly. Cc: [email protected] # 3.5+ Acked-by: Vivek Goyal <[email protected]> Reviewed-by: Ben Hutchings <[email protected]> Signed-off-by: Herton Ronaldo Krzesinski <[email protected]> Signed-off-by: Jiri Kosina <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2012-10-30xen/blkback: Fix compile warningKonrad Rzeszutek Wilk1-3/+3
drivers/block/xen-blkback/xenbus.c:260:5: warning: symbol 'xenvbd_sysfs_addif' was not declared. Should it be static? drivers/block/xen-blkback/xenbus.c:284:6: warning: symbol 'xenvbd_sysfs_delif' was not declared. Should it be static? Signed-off-by: Konrad Rzeszutek Wilk <[email protected]>
2012-10-30Input: lpc32xx-keys - select INPUT_MATRIXKMAPRoland Stigge1-0/+1
This adds a "select" dependency of KEYBOARD_LPC32XX on INPUT_MATRIXKMAP, as the other drivers are doing in this regard. This fixes the following compile error if KEYBOARD_LPC32XX is enabled but INPUT_MATRIXKMAP is not: drivers/input/keyboard/lpc32xx-keys.c:230: undefined reference to `matrix_keypad_build_keymap' Signed-off-by: Roland Stigge <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-10-30Input: pxa27x_keypad - clear pending interrupts on keypad configVasily Khoruzhick1-0/+3
Bootloader can leave interrupt bit pending, and it confuses driver. Signed-off-by: Vasily Khoruzhick <[email protected]> Acked-by: Robert Jarzmik <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-10-30Input: wacom - correct bad Cintiq 24HD checkJason Gerecke1-1/+1
Signed-off-by: Fengguang Wu <[email protected]> Signed-off-by: Jason Gerecke <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-10-30Merge tag 'v3.7-rc3' into for-linus to sync up with recent USB changesDmitry Torokhov13658-382171/+703575
2012-10-29hwmon, fam15h_power: Change email address, MAINTAINERS entryAndreas Herrmann3-4/+4
Signed-off-by: Andreas Herrmann <[email protected]> Signed-off-by: Guenter Roeck <[email protected]>
2012-10-29ath9k: fix stale pointers potentially causing access to free'd skbsFelix Fietkau1-0/+2
bf->bf_next is only while buffers are chained as part of an A-MPDU in the tx queue. When a tid queue is flushed (e.g. on tearing down an aggregation session), frames can be enqueued again as normal transmission, without bf_next being cleared. This can lead to the old pointer being dereferenced again later. This patch might fix crashes and "Failed to stop TX DMA!" messages. Signed-off-by: Felix Fietkau <[email protected]> Cc: [email protected] Signed-off-by: John W. Linville <[email protected]>
2012-10-29Merge branch 'for-john' of ↵John W. Linville7-36/+113
git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
2012-10-29ARM: dts: OMAP: Rename pandaES and var_som for consistencyBenoit Cousson3-2/+2
Rename the files to have names consistent across OMAP boards. Update the Makefile to use the new name. Signed-off-by: Benoit Cousson <[email protected]>
2012-10-29ARM: dts: omap5: Update MMC with address space and interruptsSebastien Guiriec1-0/+10
Add base address and interrupt line inside Device Tree data for OMAP5. Signed-off-by: Sebastien Guiriec <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2012-10-29ARM: dts: omap5: Update UART with address space and interruptsSebastien Guiriec1-2/+14
Add base address and interrupt line inside Device Tree data for OMAP5. Fix as well the wrong compatible string on UART5 & 6. Signed-off-by: Sebastien Guiriec <[email protected]> Reviewed-by: Shubhrajyoti D <[email protected]> [[email protected]: Update the changelog to reflect the fixes done in the patch] Signed-off-by: Benoit Cousson <[email protected]>
2012-10-29ARM: dts: omap5: Update I2C with address space and interruptsSebastien Guiriec1-2/+12
Add base address and interrupt line inside Device Tree data for OMAP5 Signed-off-by: Sebastien Guiriec <[email protected]> Reviewed-by: Shubhrajyoti D <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2012-10-29ARM: dts: omap5: Update GPIO with address space and interruptsSebastien Guiriec1-0/+16
Add base address and interrupt line inside Device Tree data for OMAP5. Signed-off-by: Sebastien Guiriec <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2012-10-29ARM: dts: OMAP: Add counter-32k nodesJon Hunter5-0/+39
Adds the counter-32k timers nodes present in OMAP2/3/4 devices and device-tree binding documentation for OMAP counter-32k. Signed-off-by: Jon Hunter <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2012-10-29ARM: dts: OMAP: Add timer nodesJon Hunter7-0/+367
Add the 12 GP timers nodes present in OMAP2. Add the 12 GP timers nodes present in OMAP3. Add the 11 GP timers nodes present in OMAP4. Add the 7 GP timers nodes present in AM33xx. Add documentation for timer properties specific to OMAP. Thanks to Vaibhav Hiremath for creating the AM33xx timer nodes. I have modified Vaibhav's original nodes adding information on which timers support a PWM output. V5 changes: - Updated timer register sizes for OMAP2/3/4. - Modified AM335x timer register size to be 1KB instead of 4KB to align with HWMOD. Signed-off-by: Jon Hunter <[email protected]> Acked-Reviewed-&-Tested-By: Vaibhav Hiremath <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2012-10-29ARM: dts: OMAP: Move interrupt-parent to the root node to avoid duplicationBenoit Cousson7-39/+3
The interrupt-parent attribute does not have to be added in each node since the fmwk will check for the parent as well to get it. Create an interrupt-parent for OMAP2, OMAP3, AM33xx and remove the attributes from every nodes that were using it. Signed-off-by: Benoit Cousson <[email protected]> Cc: Vaibhav Hiremath <[email protected]> Cc: Peter Ujfalusi <[email protected]> Cc: Sebastien Guiriec <[email protected]>
2012-10-29ARM: dts: OMAP4: add *reg* property for ocp2scpKishon Vijay Abraham I2-1/+20
*reg* property for ocp2scp was previously obtained from ti,hwmods property. But that is now explicitly added to the dt node. Also updated the documentation with *reg* info. Signed-off-by: Kishon Vijay Abraham I <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2012-10-29ARM: dts: Add twl4030-usb dataKishon Vijay Abraham I1-0/+21
Add twl4030-usb data node in twl4030 device tree file. twl4030-usb is the phy driver for MUSB used in omap3 chipsets. The dt data is comprised of two interrupts, one for ID and one for VBUS and three phandles to regulator. Acked-by: Felipe Balbi <[email protected]> Signed-off-by: Kishon Vijay Abraham I <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2012-10-29ARM: dts: Add twl6030-usb dataKishon Vijay Abraham I3-0/+13
Add twl6030-usb data node in twl6030 device tree file. twl6030-usb is the comparator driver for USB that detects VBUS and ID events. The dt data is comprised of two interrupts, one for ID and one for VBUS and a phandle to the regulator. Acked-by: Felipe Balbi <[email protected]> Signed-off-by: Kishon Vijay Abraham I <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2012-10-29Documentation: dt: i2c: Update trivial-devices listAnilKumar Ch1-0/+2
Update i2c trivial-devices list by adding the description for ti,tmp275 temperature sensor and taos,tsl2550 ambient light sensor. Signed-off-by: AnilKumar Ch <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2012-10-29ARM: dts: Add am335x-evmsk.dtsAnilKumar Ch1-0/+166
Add AM335X EVM-SK device tree source (am335x-sk.dts) file to use the am33xx.dtsi SoC file, along with the memory node information. Also adds support for tps65910 regulator and lis331dlh accelerometer. Following drivers/functionality were tested on AM335x-EVM-SK. * I2C * TPS65910 regulators * lis331dlh accelerometer AM335x EVM Starter Kit details can be accessed from: http://www.ti.com/tool/tmdssk3358 Signed-off-by: AnilKumar Ch <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2012-10-29ARM: dts: AM33XX: Add tsl2550 ambient light sensor DT dataAnilKumar Ch1-1/+6
In AM335x EVM tsl2550 ambient light sensor is connected to I2C2 bus. Add child node inside i2c2 node with i2c slave address. TAOS tsl2550 sensor is using a two-wire SMBus serial interface. Reduce I2C2 clock frequency to 100kHz from 400kHz because the maximum clock frequency of SMBus is 100kHz. Signed-off-by: AnilKumar Ch <[email protected]> [[email protected]: Clean the changelog] Signed-off-by: Benoit Cousson <[email protected]>
2012-10-29ARM: dts: AM33XX: Add temperature sensor device tree data to am335x-evmAnilKumar Ch1-0/+5
Add temperature sensor DT data to am335x-evm.dts. In AM335x EVM tmp275 temperature sensor is connected to I2C2 bus. So this patch adds child node inside i2c2 node with i2c slave address. This patch is tested on AM335x EVM. Signed-off-by: AnilKumar Ch <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2012-10-29ARM: dts: AM33XX: Add lis331dlh device tree data to am335x-evmAnilKumar Ch1-0/+39
Add lis331dlh device tree data to am335x-evm.dts. In AM335x EVM lis331dlh accelerometer is connected to I2C2 bus. So this patch change the status of I2C2 node to "okay" to use I2C2 bus. Also added all the required platform data to am335x-evm. Signed-off-by: AnilKumar Ch <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2012-10-29ARM: dts: AM33XX: Add D_CAN device tree dataAnilKumar Ch1-0/+18
Add Bosch D_CAN controller device tree data to AM33XX dtsi file by adding d_can device nodes with all the necessary parameters. Signed-off-by: AnilKumar Ch <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2012-10-29ARM: dts: AM33XX: Add basic pinctrl device tree dataAnilKumar Ch1-0/+9
Adds basic pinctrl device tree data for AM33XX family of devices. This patch is based on the pinctrl-single driver. Signed-off-by: AnilKumar Ch <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2012-10-29ARM: dts: AM33XX: Add device tree OPP tableAnilKumar Ch3-0/+27
Add DT OPP table for AM33XX family of devices. This data is decoded by OF with of_init_opp_table() helper function. Also adds cpu0 supply name to the corresponding dts files. cpu0-supply name is used by cpufreq-cpu0 driver to get the regulator pointer for voltage modifications. Signed-off-by: AnilKumar Ch <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2012-10-29ARM: dts: Add omap3-beagle.dtsJon Hunter4-6/+74
Add a minimal dts for original OMAP3430/3530 version of the Beagle board. This version of the Beagle board has 256MB of DDR and features the same TWL4030 power management IC (PMIC) as the Beagle board XM. Given that the Beagle and Beagle-XM boards use the same PMIC, move the definition of the VSIM regulator into the TWL4030.dtsi file so that we do not need to duplicate in the Beagle board dts file. This has been boot tested on an OMAP3530 Beagle board and verifing that the SD/MMC interface is working with a SD card. V2 changes - Rebased upon of devel-dt - Corrected copyright date in omap3-beagle.dts file - Added LED support after verifing that Beagle and Beagle XM have the same LED configuration Signed-off-by: Jon Hunter <[email protected]> Signed-off-by: Benoit Cousson <[email protected]>
2012-10-29Merge branch 'for-linus' of ↵Linus Torvalds2-2/+6
git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client Pull Ceph fixes form Sage Weil: "There are two fixes in the messenger code, one that can trigger a NULL dereference, and one that error in refcounting (extra put). There is also a trivial fix that in the fs client code that is triggered by NFS reexport." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: ceph: fix dentry reference leak in encode_fh() libceph: avoid NULL kref_put when osd reset races with alloc_msg rbd: reset BACKOFF if unable to re-queue
2012-10-29ceph: fix dentry reference leak in encode_fh()David Zafman1-0/+2
Call to d_find_alias() needs a corresponding dput() This fixes http://tracker.newdream.net/issues/3271 Signed-off-by: David Zafman <[email protected]> Reviewed-by: Sage Weil <[email protected]>
2012-10-28ext4: fix unjournaled inode bitmap modificationEric Sandeen1-10/+9
commit 119c0d4460b001e44b41dcf73dc6ee794b98bd31 changed ext4_new_inode() such that the inode bitmap was being modified outside a transaction, which could lead to corruption, and was discovered when journal_checksum found a bad checksum in the journal during log replay. Nix ran into this when using the journal_async_commit mount option, which enables journal checksumming. The ensuing journal replay failures due to the bad checksums led to filesystem corruption reported as the now infamous "Apparent serious progressive ext4 data corruption bug" [ Changed by tytso to only call ext4_journal_get_write_access() only when we're fairly certain that we're going to allocate the inode. ] I've tested this by mounting with journal_checksum and running fsstress then dropping power; I've also tested by hacking DM to create snapshots w/o first quiescing, which allows me to test journal replay repeatedly w/o actually power-cycling the box. Without the patch I hit a journal checksum error every time. With this fix it survives many iterations. Reported-by: Nix <[email protected]> Signed-off-by: Eric Sandeen <[email protected]> Signed-off-by: "Theodore Ts'o" <[email protected]> Cc: [email protected]
2012-10-28netfilter: nf_defrag_ipv6: solve section mismatch in nf_conntrack_reasmHein Tibosch1-2/+2
WARNING: net/ipv6/netfilter/nf_defrag_ipv6.o(.text+0xe0): Section mismatch in reference from the function nf_ct_net_init() to the function .init.text:nf_ct_frag6_sysctl_register() The function nf_ct_net_init() references the function __init nf_ct_frag6_sysctl_register(). In case nf_conntrack_ipv6 is compiled as a module, nf_ct_net_init could be called after the init code and data are unloaded. Therefore remove the "__net_init" annotation from nf_ct_frag6_sysctl_register(). Signed-off-by: Hein Tibosch <[email protected]> Acked-by: Cong Wang <[email protected]> Signed-off-by: Pablo Neira Ayuso <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.