commit d31bf2883542cd3414674238f94123bd1d9c0b9f Author: Greg Kroah-Hartman Date: Wed Aug 17 10:57:16 2011 -0700 Linux 3.0.3 commit cb52eec12483475b1c1dcea3d817528b5724a209 Author: Jonathan Nieder Date: Fri Aug 5 18:58:38 2011 +0200 perf tools: do not look at ./config for configuration commit aba8d056078e47350d85b06a9cabd5afcc4b72ea upstream. In addition to /etc/perfconfig and $HOME/.perfconfig, perf looks for configuration in the file ./config, imitating git which looks at $GIT_DIR/config. If ./config is not a perf configuration file, it fails, or worse, treats it as a configuration file and changes behavior in some unexpected way. "config" is not an unusual name for a file to be lying around and perf does not have a private directory dedicated for its own use, so let's just stop looking for configuration in the cwd. Callers needing context-sensitive configuration can use the PERF_CONFIG environment variable. Requested-by: Christian Ohm Cc: 632923@bugs.debian.org Cc: Ben Hutchings Cc: Christian Ohm Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/20110805165838.GA7237@elie.gateway.2wire.net Signed-off-by: Jonathan Nieder Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Greg Kroah-Hartman commit 920d4ab70ec7f77293084b3da73ae445b1dd2d67 Author: Alex Deucher Date: Sat Aug 13 13:36:13 2011 -0400 drm/radeon/kms: don't try to be smart in the hpd handler commit d5811e8731213f80c80d89e980505052f16aca1c upstream. Attempting to try and turn off disconnected display hw in the hotput handler lead to more problems than it helped. For now just register an event and only attempt the do something interesting with DP. Other connectors are just too problematic: - Some systems have an HPD pin assigned to LVDS, but it's rarely if ever connected properly and we don't really care about hpd events on LVDS anyway since it's always connected. - The HPD pin is wired up correctly for eDP, but we don't really have to do anything since the events since it's always connected. - Some HPD pins fire more than once when you connect/disconnect - etc. Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=39882 Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie Signed-off-by: Greg Kroah-Hartman commit d24884b24d1527ead9b7a3a54516925de826b518 Author: Alex Deucher Date: Thu Aug 11 14:01:03 2011 +0000 drm/radeon/kms: fix regression is handling >2 heads on cedar/caicos commit 33ae1827d6c3c79c5957536ec29d5a8780623147 upstream. Need to add support for 4 crtcs when setting the possible crtcs for the encoders. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie Signed-off-by: Greg Kroah-Hartman commit cdc0fbfac92e20e64737ec0648f38be03d5a29d3 Author: Alex Deucher Date: Tue Aug 9 17:09:06 2011 +0000 drm/radeon/kms: don't enable connectors that are off in the hotplug handler commit 73104b5cfe3067d68f2c2de3f3d4d4964c55873e upstream. If we get a hotplug event on an connector that is off, don't attempt to turn it on or off, it should already be off. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=728228 Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie Signed-off-by: Greg Kroah-Hartman commit 3438bc96d02ea314a04759e435e50b5b6177f88c Author: Rusty Russell Date: Mon Aug 15 10:15:10 2011 +0930 lguest: allow booting guest with CONFIG_RELOCATABLE=y commit e22a539824e8ddb82c87b4f415165ede82e6ab56 upstream. The CONFIG_RELOCATABLE code tries to align the unpack destination to the value of 'kernel_alignment' in the setup_hdr. If that's 0, it tries to unpack to address 0, which in fact causes the gunzip code to call 'error("Out of memory while allocating output buffer")'. The bootloader (ie. the lguest Launcher in this case) should be doing setting this field; the normal bzImage is 16M, we can use the same. Reported-by: Stefanos Geraggelos Signed-off-by: Rusty Russell Signed-off-by: Greg Kroah-Hartman commit 2366d7cc46e70064f33be79dc415b069d3122772 Author: Clemens Ladisch Date: Tue Jun 21 22:09:50 2011 +0200 mm: fix wrong vmap address calculations with odd NR_CPUS values commit f982f91516fa4cfd9d20518833cd04ad714585be upstream. Commit db64fe02258f ("mm: rewrite vmap layer") introduced code that does address calculations under the assumption that VMAP_BLOCK_SIZE is a power of two. However, this might not be true if CONFIG_NR_CPUS is not set to a power of two. Wrong vmap_block index/offset values could lead to memory corruption. However, this has never been observed in practice (or never been diagnosed correctly); what caught this was the BUG_ON in vb_alloc() that checks for inconsistent vmap_block indices. To fix this, ensure that VMAP_BLOCK_SIZE always is a power of two. BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=31572 Reported-by: Pavel Kysilka Reported-by: Matias A. Fonzo Signed-off-by: Clemens Ladisch Signed-off-by: Stefan Richter Cc: Nick Piggin Cc: Jeremy Fitzhardinge Cc: Krzysztof Helt Cc: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman commit a4e0b4cc115c938f75ca7cf24b0a739da846a6c7 Author: Bob Copeland Date: Sun Aug 7 19:36:07 2011 -0400 ath5k: fix error handling in ath5k_beacon_send commit bdc71bc59231f5542af13b5061b9ab124d093050 upstream. This cleans up error handling for the beacon in case of dma mapping failure. We need to free the skb when dma mapping fails instead of nulling and leaking the pointer, and we should bail out to avoid giving the hardware the bad descriptor. Finally, we need to perform the null check after trying to update the beacon, or else beacons will never be sent after a single mapping failure. Signed-off-by: Bob Copeland Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman commit cbdeede6a6725dcc13f1a1dc1fc1d1ebe238c7fd Author: Stephen Warren Date: Thu Aug 4 16:44:43 2011 -0600 ASoC: Tegra: wm8903 machine driver: Allow re-insertion of module commit 29591ed4ac6fe00e3ff23b5be0cdc7016ef9c47e upstream. Two issues were preventing module snd-soc-tegra-wm8903.ko from being removed and re-inserted: a) The speaker-enable GPIO is hosted by the WM8903 chip. This GPIO must be freed before snd_soc_unregister_card() is called, because that triggers wm8903.c:wm8903_remove(), which calls gpiochip_remove(), which then fails if any of the GPIOs are in use. To solve this, free all GPIOs first, so the code doesn't care where they come from. b) We need to call snd_soc_jack_free_gpios() to match the call to snd_soc_jack_add_gpios() during initialization. Without this, the call to snd_soc_jack_add_gpios() fails during any subsequent modprobe and initialization, since the GPIO and IRQ are already registered. In turn, this causes the headphone state not to be monitored, so the headphone is assumed not to be plugged in, and the audio path to it is never enabled. Signed-off-by: Stephen Warren Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman commit ca42ad986d2012e7658ac8611c4cf4c6a91f78f6 Author: Stephen Warren Date: Thu Aug 4 16:44:42 2011 -0600 ASoC: Tegra: tegra_pcm_deallocate_dma_buffer: Don't OOPS commit a96edd59b2bc88b3d1ea47e0ba48076d65db9302 upstream. Not all PCM devices have all sub-streams. Specifically, the SPDIF driver only supports playback and hence has no capture substream. Check whether a substream exists before dereferencing it, when de-allocating DMA buffers in tegra_pcm_deallocate_dma_buffer. Signed-off-by: Stephen Warren Acked-by: Liam Girdwood Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman commit ee73429151fbedb9381fb737fb7c732fbddf04f1 Author: Mark Brown Date: Wed Aug 3 17:36:48 2011 +0900 ASoC: Fix binding of WM8750 on Jive commit 6678050442e90a4e9511a9ed14b9bdfc5e393323 upstream. The I2C address is misformatted and would never match. Signed-off-by: Mark Brown Acked-by: Liam Girdwood Signed-off-by: Greg Kroah-Hartman commit 8adf76d75e7ed6d30c4aa598bf8ac51de50f3adb Author: Daniel Mack Date: Fri Aug 5 13:49:52 2011 +0200 ALSA: snd-usb-caiaq: Correct offset fields of outbound iso_frame_desc commit 15439bde3af7ff88459ea2b5520b77312e958df2 upstream. This fixes faulty outbount packets in case the inbound packets received from the hardware are fragmented and contain bogus input iso frames. The bug has been there for ages, but for some strange reasons, it was only triggered by newer machines in 64bit mode. Signed-off-by: Daniel Mack Reported-and-tested-by: William Light Reported-by: Pedro Ribeiro Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman commit 8282be4dd5ff3fef30271c61ee74db66524d8350 Author: Julia Lawall Date: Tue Aug 9 11:10:56 2011 -0400 hwmon: (ibmaem) add missing kfree commit 66a89b2164e2d30661edbd1953eacf0594d8203a upstream. rs_resp is dynamically allocated in aem_read_sensor(), so it should be freed before exiting in every case. This collects the kfree and the return at the end of the function. Signed-off-by: Julia Lawall Signed-off-by: Guenter Roeck Signed-off-by: Greg Kroah-Hartman commit 55041e081ef433774279ecb6fc3fd30f741f5f37 Author: Chas Williams Date: Mon Aug 1 17:56:14 2011 -0700 atm: br2864: sent packets truncated in VC routed mode commit a08af810cdc29d2ca930e8a869d3d01744c392d8 upstream. Reported-by: Pascal Hambourg Signed-off-by: Chas Williams Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman commit d7a8a78d13730620f9527cff14b444266c05e0cb Author: Andrew Bird Date: Wed Jul 27 17:03:20 2011 +0100 USB: option driver: add PID for Vodafone-Huawei K4511 commit 35e9e21fb30dc4452b33aed5cbf233743bffca40 upstream. This patch adds the product ID of Huawei's Vodafone K4511 mobile broadband modem to option.c. This is necessary so that the driver gets loaded on demand without the intervention of usb_modeswitch. This has the benefit of it becoming available faster and also ensures that the option driver is not bound to a network interface that should be claimed by cdc_ether. Signed-off-by: Andrew Bird Signed-off-by: Greg Kroah-Hartman commit bde495661c66e72a7c3fed9ba1880611d9a63705 Author: Andrew Bird Date: Wed Jul 27 17:03:19 2011 +0100 USB: option driver: add PID for Vodafone-Huawei K4510 commit 0930bb46bbbb43afe3381ece2cb2f8a5bc3fb544 upstream. This patch adds the product ID of Huawei's Vodafone K4510 mobile broadband modem to option.c. This is necessary so that the driver gets loaded on demand without the intervention of usb_modeswitch. This has the benefit of it becoming available faster and also ensures that the option driver is not bound to a network interface that should be claimed by cdc_ether. Signed-off-by: Andrew Bird Signed-off-by: Greg Kroah-Hartman commit 4e5167b20f1776a135b8c3ad7e0ff3f0319dd198 Author: Andrew Bird Date: Wed Jul 27 17:03:18 2011 +0100 USB: option driver: add PID for Vodafone-Huawei K3771 commit e2949080792256d1c979aaf30ecd4cab42829f87 upstream. This patch adds the product ID of Huawei's Vodafone K3771 mobile broadband modem to option.c. This is necessary so that the driver gets loaded on demand without the intervention of usb_modeswitch. This has the benefit of it becoming available faster and also ensures that the option driver is not bound to a network interface that should be claimed by cdc_ether. Signed-off-by: Andrew Bird Signed-off-by: Greg Kroah-Hartman commit 4530adde822fdd5be9b3260ce0b1055b4738b1a7 Author: Andrew Bird Date: Wed Jul 27 17:03:17 2011 +0100 USB: option driver: add PID for Vodafone-Huawei K3770 commit 07b21fd83606263fe6f327b98774d51e13e502fd upstream. This patch adds the product ID of Huawei's Vodafone K3770 mobile broadband modem to option.c. This is necessary so that the driver gets loaded on demand without the intervention of usb_modeswitch. This has the benefit of it becoming available faster and also ensures that the option driver is not bound to a network interface that should be claimed by cdc_ether. Signed-off-by: Andrew Bird Signed-off-by: Greg Kroah-Hartman commit 34c74ec5febd0d9dfcfd86bf02dd3f810ed16039 Author: Vijay Chavan Date: Tue Aug 9 02:41:12 2011 +0530 USB: Serial: Added device ID for Qualcomm Modem in Sagemcom's HiLo3G commit e468561739fffb972d486b98f66c723936335136 upstream. A new device ID pair is added for Qualcomm Modem present in Sagemcom's HiLo3G module. Signed-off-by: Vijay Chavan Signed-off-by: Greg Kroah-Hartman commit 60e73afa1e668cce57e86e18ebe5e905227acc72 Author: Nick Bowler Date: Wed Jul 13 11:40:09 2011 -0400 USB: usb-storage: unusual_devs entry for ARM V2M motherboard. commit a871e4f5519d8c52430052e1d340dd5710eb5ad6 upstream. Connecting the V2M to a Linux host results in a constant stream of errors spammed to the console, all of the form sd 1:0:0:0: ioctl_internal_command return code = 8070000 : Sense Key : 0x4 [current] : ASC=0x0 ASCQ=0x0 The errors appear to be otherwise harmless. Add an unusual_devs entry which eliminates all of the error messages. Signed-off-by: Nick Bowler Acked-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit b2dc65e856c69b36a183c0ba41ff5f5a3af92fc8 Author: Ionut Nicu Date: Mon Jul 11 16:46:12 2011 +0300 USB: ftdi_sio: fix minor typo in get_ftdi_divisor commit 1862cdd542025218f7a390b7e6ddc83a1362d1e0 upstream. Even if it's unlikely for this to cause an error, there is a typo in the code that uses the bitwise-AND operator instead of the logical one. Signed-off-by: Ionut Nicu Signed-off-by: Greg Kroah-Hartman commit 73ca9294d982e43a1945ae00262d9ee6b09efe34 Author: Maxim Nikulin Date: Sat Jul 9 23:44:44 2011 +0700 USB: assign instead of equal in usbtmc.c commit 4f1a7a3e78037721496283ea3e87cfefc64d99c7 upstream. Assign operator instead of equality test in the usbtmc_ioctl_abort_bulk_in() function. Signed-off-by: Maxim A. Nikulin Signed-off-by: Greg Kroah-Hartman commit e839bad463ad3348f3d239512839c93baf57a1a9 Author: John Stultz Date: Wed Jul 20 17:09:34 2011 -0700 usb: musb: fix oops on musb_gadget_pullup commit 72c487dfb94d02025fb7437dfe2314d836d5a9ab upstream. an 'unhandled fault' is causes when a gadget driver calls usb_gadget_connect() while the USB cable isn't plugged into the OTG port. the fault is caused by an access to MUSB's memory space while its clock is turned off due to pm_runtime kicking in. in order to fix the fault, we enclose musb_gadget_pullup() with pm_runtime_get_sync() ... pm_runtime_put() calls to be sure we will always reach that path with clock turned on. [ balbi@ti.com : simplified commit log; removed few things which didn't belong there ] Reported-by: Zach Pfeffer Signed-off-by: John Stultz Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 024d78c79eb4ee5395ed8f13233b5b15e3445db3 Author: Sebastian Andrzej Siewior Date: Fri Jul 29 11:05:45 2011 +0200 usb/config: use proper endian access for wMaxPacketSize commit 7de7c7d2cb49900e0b967be871bf695c7d6135c9 upstream. wMaxPacketSize is __le16 and should be accessed as such. Also fix the wBytesPerInterval assignment while here. v2: also fix the wBytesPerInterval assigment, noticed by Matt Evans This patch should be backported to the 3.0 kernel. Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Sarah Sharp Acked-by: Matt Evans Signed-off-by: Greg Kroah-Hartman commit d4194efe3582a8e17add88ad1fcf8e2fd00504ce Author: Sarah Sharp Date: Fri Jul 1 13:35:40 2011 -0700 xhci: Don't submit commands or URBs to halted hosts. commit 7bd89b4017f46a9b92853940fd9771319acb578a upstream. Commit fccf4e86200b8f5edd9a65da26f150e32ba79808 "USB: Free bandwidth when usb_disable_device is called" caused a bit of an issue when the xHCI host controller driver is unloaded. It changed the USB core to remove all endpoints when a USB device is disabled. When the driver is unloaded, it will remove the SuperSpeed split root hub, which will disable all devices under that roothub and then halt the host controller. When the second High Speed split roothub is removed, the USB core will attempt to disable the endpoints, which will submit a Configure Endpoint command to a halted host controller. The command will eventually time out, but it makes the xHCI driver unload take *minutes* if there are a couple of USB 1.1/2.0 devices attached. We must halt the host controller when the SuperSpeed roothub is removed, because we can't allow any interrupts from things like port status changes. Make several different functions not submit commands or URBs to the host controller when the host is halted, by adding a check in xhci_check_args(). xhci_check_args() is used by these functions: xhci.c-int xhci_urb_enqueue() xhci.c-int xhci_drop_endpoint() xhci.c-int xhci_add_endpoint() xhci.c-int xhci_check_bandwidth() xhci.c-void xhci_reset_bandwidth() xhci.c-static int xhci_check_streams_endpoint() xhci.c-int xhci_discover_or_reset_device() It's also used by xhci_free_dev(). However, we have to take special care in that case, because we want the device memory to be freed if the host controller is halted. This patch should be backported to the 2.6.39 and 3.0 kernel. Signed-off-by: Sarah Sharp Signed-off-by: Greg Kroah-Hartman commit 2c97674e78c73410d4ac9f63643d05682b2e8f70 Author: JiSheng Zhang Date: Sat Jul 16 11:04:19 2011 +0800 USB: xhci: fix OS want to own HC commit 6768458b17f9bf48a4c3a34e49b20344091b5f7e upstream. Software should set XHCI_HC_OS_OWNED bit to request ownership of xHC. This patch should be backported to kernels as far back as 2.6.31. Signed-off-by: JiSheng Zhang Signed-off-by: Sarah Sharp Signed-off-by: Greg Kroah-Hartman commit 92d934f0145afdefdb47e688b6376b87ad4f066d Author: Stefan Lippers-Hollmann Date: Tue Aug 2 22:17:25 2011 +0200 staging: rtl8192u: declare MODULE_FIRMWARE commit 589c3ca00b7886bf743998398884cd4f4d354e17 upstream. declaring MODULE_FIRMWARE has apparently forgotten while removing the embedded firmware arrays in 0a8692b534e18fcec6eac07551bb37a22659f5c7 (rtl8192u_usb: Remove built-in firmware images). Signed-off-by: Stefan Lippers-Hollmann Signed-off-by: Greg Kroah-Hartman