aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-04-28ALSA: hda - Add support of line-out automute for RealtekTakashi Iwai1-154/+120
Add the common helper function and flags to support the auto-mute per line-out jack detection, and also the mute of line-out jacks. A few model-specific implementations are replaced with the common helpers. Signed-off-by: Takashi Iwai <[email protected]>
2011-04-28ALSA: hda - Add common automute support for mxier-amp on/off for ReatekTakashi Iwai1-457/+194
Some models do mute on/off the connected mixer widget for the automatic muting, instead of controlling the pin widget itself. This patch adds the implementation of such type of auto-mute in the common helper function, and reduces the redundant codes for each model preset. Signed-off-by: Takashi Iwai <[email protected]>
2011-04-28ALSA: hda - Consolidate default automute functions for RealtekTakashi Iwai1-97/+163
There are two entry points for the headphone automute functions for Realtek, alc_automute_amp() and alc_automute_pin(). These call the same function in the end, so we can basically consolidate these with a flag in spec. Signed-off-by: Takashi Iwai <[email protected]>
2011-04-28ASoC: Don't specify the DMA driver for Goni baseband linkMark Brown1-1/+0
Signed-off-by: Mark Brown <[email protected]> Acked-by: Jassi Brar <[email protected]> Acked-by: Liam Girdwood <[email protected]>
2011-04-28ASoC: Don't specify the DMA driver for OpenMoko baseband linkMark Brown1-1/+0
Signed-off-by: Mark Brown <[email protected]> Acked-by: Jassi Brar <[email protected]> Acked-by: Liam Girdwood <[email protected]>
2011-04-28Merge branch 'for-2.6.39' into for-2.6.40Mark Brown1-4/+4
2011-04-28ASoC: Fix CODEC DAI names for GoniMark Brown1-2/+2
Immediately after sending the last fix I realised that the CODEC DAI names also don't correspond to the WM8994 driver. Update the DAI names to match. Signed-off-by: Mark Brown <[email protected]> Acked-by: Jassi Brar <[email protected]> Acked-by: Liam Girdwood <[email protected]>
2011-04-28ASoC: Fix CODEC name in GoniMark Brown1-2/+2
This was typoed at some point in the multi-component merge, though the driver was added along with that. Signed-off-by: Mark Brown <[email protected]> Acked-by: Jassi Brar <[email protected]> Acked-by: Liam Girdwood <[email protected]>
2011-04-28ASoC: Work around allmodconfig failureMark Brown3-4/+9
Signed-off-by: Mark Brown <[email protected]> Acked-by: Liam Girdwood <[email protected]>
2011-04-28ARM: Fix .size directive for xscale_dma_a0_map_areaBen Hutchings1-1/+1
gas used to accept (and ignore?) .size directives which referred to undefined symbols, as this does. In binutils 2.21 these are treated as fatal errors. Signed-off-by: Ben Hutchings <[email protected]> Signed-off-by: Eric Miao <[email protected]>
2011-04-28x86: ce4100: Configure IOAPIC pins for USB and SATA to level typeSebastian Andrzej Siewior1-3/+3
The USB and SATA ioapic interrrupt pins are configured as edge type, but need to be level type interrupts to work correctly. [ tglx: Split out from the combo patch ] Cc: Torben Hohn <[email protected]> Signed-off-by: Sebastian Andrzej Siewior <[email protected]> Link: http://lkml.kernel.org/r/%3C20110427143052.GA15211%40linutronix.de%3E Signed-off-by: Thomas Gleixner <[email protected]>
2011-04-28x86: devicetree: Configure IOAPIC pin only onceSebastian Andrzej Siewior3-7/+7
We use io_apic_setup_irq_pin() in order to configure pin's interrupt number polarity and type. This is done on every irq_create_of_mapping() which happens for instance during pci enable calls. Level typed interrupts are masked by default, edge are unmasked. On the first ->xlate() call the level interrupt is configured and masked. The driver calls request_irq() and the line is unmasked. Lets assume the interrupt line is shared with another device and we call pci_enable_device() for this device. The ->xlate() configures the pin again and it is masked. request_irq() does not unmask the line because it _is_ already unmasked according to its internal state. So the interrupt will never be unmasked again. This patch is based on an earlier work by Torben Hohn and solves the problem by configuring the pin only once. Since all devices must agree on the same type and polarity there is no point in configuring the pin more than once. [ tglx: Split out the ce4100 part into a separate patch ] Cc: Torben Hohn <[email protected]> Signed-off-by: Sebastian Andrzej Siewior <[email protected]> Link: http://lkml.kernel.org/r/%3C20110427143052.GA15211%40linutronix.de%3E Signed-off-by: Thomas Gleixner <[email protected]>
2011-04-28ALSA: hda - VIA: Fix notify_aa_path_ctls() invalid issue.Lydia Wang1-3/+7
In notify_aa_path_ctls(), adds 'rear mic' item and confirms the A-A path control existing before notifying card that the A-A path volume is muted if smart5.1 is enabled. Signed-off-by: Lydia Wang <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2011-04-28rtc: max8925: Call dev_set_drvdata before rtc_device_registerZhangfei Gao1-1/+2
We call rtc_read_alarm from rtc_device_register, so it is important that the rtc device is fully initialized prior to registration. rtc-max8925 sets drvdata after register, so the rtc_read_alarm code dereferences a NULL pointer. Call dev_set_drvdata before rtc_device_register. [ jstultz/tglx: Massaged commit message ] Signed-off-by: Zhangfei Gao <[email protected]> Cc: Alessandro Zummo <[email protected]> Link: http://lkml.kernel.org/r/%3C1303929869-25249-1-git-send-email-john.stultz%40linaro.org%3E Signed-off-by: John Stultz <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]>
2011-04-28ALSA: usb-audio - Don't expose broken dB rangesTakashi Iwai1-4/+6
Some crappy USB-audio devices give broken dB ranges, e.g. both min and max are 0dB. This confuses the volume control that prefers dB expression such as alsactl or PulseAudio. In such a case, it's much better not to expose the broken dB information. Signed-off-by: Takashi Iwai <[email protected]>
2011-04-27Input: wm831x-ts - move BTN_TOUCH reporting to data transferMark Brown1-3/+2
Don't report BTN_TOUCH until we've got data as some less robust applications can be confused by getting a touch event by itself and it doesn't seem unreasonable for them to expect coordinates along with a touch. Signed-off-by: Mark Brown <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2011-04-27Input: wm831x-ts - allow IRQ flags to be specifiedMark Brown2-3/+15
This allows maximum flexibility for configuring the direct GPIO based interrupts. Signed-off-by: Mark Brown <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2011-04-27Input: wm831x-ts - fix races with IRQ managementMark Brown1-5/+49
If the WM831x pen down and data IRQs run in parallel it is possible for the data and pen down IRQs to deadlock themselves as one is part way through disabling its operation while the other is part way through enabling. Fix this by always disabling the pen down interrupt while data is active and vice versa. When a changeover is required we disable the IRQ that is to be stopped then schedule work that will enable the new IRQ. We need to handle the data flow in the data IRQ as the readback from the device needs to be ordered correctly with the IRQ for robust operation. This also fixes an issue when using the built in IRQs due to enable_irq() not being valid from interrupt context on an interrupt controller with bus operations like the built in IRQ controller - this issue may also have affected other interrupt controllers. We can't rely on having the data and pen down IRQs available via GPIOs on the CPU on every system. Signed-off-by: Mark Brown <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2011-04-27mmc: sdhci: Check mrq != NULL in sdhci_tasklet_finishChris Ball1-0/+7
It seems that under certain circumstances the sdhci_tasklet_finish() call can be entered with mrq set to NULL, causing the system to crash with a NULL pointer de-reference. Seen on S3C6410 system. Based on a patch by Dimitris Papastamos. Reported-by: Dimitris Papastamos <[email protected]> Cc: <[email protected]> Signed-off-by: Chris Ball <[email protected]>
2011-04-27mmc: sdhci: Check mrq->cmd in sdhci_tasklet_finishBen Dooks1-1/+1
It seems that under certain circumstances that the sdhci_tasklet_finish() call can be entered with mrq->cmd set to NULL, causing the system to crash with a NULL pointer de-reference. Unable to handle kernel NULL pointer dereference at virtual address 00000000 PC is at sdhci_tasklet_finish+0x34/0xe8 LR is at sdhci_tasklet_finish+0x24/0xe8 Seen on S3C6410 system. Signed-off-by: Ben Dooks <[email protected]> Signed-off-by: Mark Brown <[email protected]> Cc: <[email protected]> Signed-off-by: Chris Ball <[email protected]>
2011-04-27mmc: tmio: fix .set_ios(MMC_POWER_UP) handlingGuennadi Liakhovetski1-5/+5
The aggressive clock gating for TMIO MMC patch has broken switching interface power on, using MFD or platform callbacks. Restore the ios->power_mode == MMC_POWER_UP && ios->clock == 0 case handling. Signed-off-by: Guennadi Liakhovetski <[email protected]> Signed-off-by: Chris Ball <[email protected]>
2011-04-27mmc: fix a race between card-detect rescan and clock-gate work instancesGuennadi Liakhovetski2-6/+4
Currently there is a race in the MMC core between a card-detect rescan work and the clock-gating work, scheduled from a command completion. Fix it by removing the dedicated clock-gating mutex and using the MMC standard locking mechanism instead. Signed-off-by: Guennadi Liakhovetski <[email protected]> Cc: Simon Horman <[email protected]> Cc: Magnus Damm <[email protected]> Acked-by: Linus Walleij <[email protected]> Cc: <[email protected]> Signed-off-by: Chris Ball <[email protected]>
2011-04-27mmc: omap: Fix possible NULL pointer derefMichael Buesch1-1/+1
Either OMAP_MMC_STAT_CARD_ERR or OMAP_MMC_STAT_END_OF_CMD might fire if there is no host->cmd pointer. Check for a valid host->cmd pointer before calling mmc_omap_cmd_done(). Signed-off-by: Michael Buesch <[email protected]> Acked-by: Tony Lindgren <[email protected]> Signed-off-by: Chris Ball <[email protected]>
2011-04-27mmc: core: mmc_add_card(): fix missing break in switch statementMichał Mirosław1-0/+1
Fixes a cosmetic bug that affects printk() for SD-combo cards. Reported-by: Prashanth Bhat <[email protected]> Signed-off-by: Michał Mirosław <[email protected]> Signed-off-by: Chris Ball <[email protected]>
2011-04-27mmc: sdhci-pci: Fix error case in sdhci_pci_probe_slot()Chris Ball1-0/+1
If pci_ioremap_bar() fails during probe, we "goto release;" and free the host, but then we return 0 -- which tells sdhci_pci_probe() that the probe succeeded. Since we think the probe succeeded, when we unload sdhci we'll go to sdhci_pci_remove_slot() and it will try to dereference slot->host, which is now NULL because we freed it in the error path earlier. The patch simply sets ret appropriately, so that sdhci_pci_probe() will detect the failure immediately and bail out. Signed-off-by: Chris Ball <[email protected]> Cc: <[email protected]>
2011-04-27Merge branch 'fixes' of ↵Linus Torvalds2-1/+4
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6 * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6: [PARISC] slub: fix panic with DISCONTIGMEM [PARISC] set memory ranges in N_NORMAL_MEMORY when onlined
2011-04-27Merge branch 'pm-fixes' of ↵Linus Torvalds3-1/+6
git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 * 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: ACPI / PM: Avoid infinite recurrence while registering power resources PM / Wakeup: Fix initialization of wakeup-related device sysfs files
2011-04-27Merge branch 'spell-fix' of git://git.profusion.mobi/users/lucas/linux-2.6Linus Torvalds19-19/+19
* 'spell-fix' of git://git.profusion.mobi/users/lucas/linux-2.6: Revert wrong fixes for common misspellings
2011-04-27Merge branch 'v4l_for_linus' of ↵Linus Torvalds37-152/+512
git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (42 commits) [media] media: vb2: correct queue initialization order [media] media: vb2: fix incorrect v4l2_buffer->flags handling [media] s5p-fimc: Add support for the buffer timestamps and sequence [media] s5p-fimc: Fix bytesperline and plane payload setup [media] s5p-fimc: Do not allow changing format after REQBUFS [media] s5p-fimc: Fix FIMC3 pixel limits on Exynos4 [media] tda18271: update tda18271c2_rf_cal as per NXP's rev.04 datasheet [media] tda18271: update tda18271_rf_band as per NXP's rev.04 datasheet [media] tda18271: fix bad calculation of main post divider byte [media] tda18271: prog_cal and prog_tab variables should be s32, not u8 [media] tda18271: fix calculation bug in tda18271_rf_tracking_filters_init [media] omap3isp: queue: Don't corrupt buf->npages when get_user_pages() fails [media] v4l: Don't register media entities for subdev device nodes [media] omap3isp: Don't increment node entity use count when poweron fails [media] omap3isp: lane shifter support [media] omap3isp: ccdc: support Y10/12, 8-bit bayer fmts [media] media: add missing 8-bit bayer formats and Y12 [media] v4l: add V4L2_PIX_FMT_Y12 format cx23885: Fix stv0367 Kconfig dependency [media] omap3isp: Use isp xclk defines ... Fix up trivial conflict (spelink errurs) in drivers/media/video/omap3isp/isp.c
2011-04-27ASoC: Implement WM8962 ADC high pass filter configurationMark Brown1-0/+10
Signed-off-by: Mark Brown <[email protected]> Acked-by: Liam Girdwood <[email protected]>
2011-04-27ASoC: Add dapm_find_widget helperLars-Peter Clausen1-70/+45
This patch adds a helper function for searching DAPM widgets by name. This allows to streamline functions which operate on widgets by name. It also allows to get rid of copy'n'pasted code which was added to fallback to widgets from other contexts if the widget was not found in the current context. Signed-off-by: Lars-Peter Clausen <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2011-04-27ASoC: Don't specify the DMA driver for Speyside baseband linkMark Brown1-1/+0
Signed-off-by: Mark Brown <[email protected]> Acked-by: Jassi Brar <[email protected]> Acked-by: Liam Girdwood <[email protected]>
2011-04-27ASoC: Add more natural support for no-DMA DAIsMark Brown2-5/+66
Since we can now support multiple platforms allow machines to not specify a platform in a DAI link. Since the rest of the code requires that we have a struct device for all objects we do this by substituting in a dummy device that we register automatically. Signed-off-by: Mark Brown <[email protected]> Acked-by: Jassi Brar <[email protected]> Acked-by: Liam Girdwood <[email protected]>
2011-04-27ASoC: Allow platform drivers to have no ops structureMark Brown1-19/+24
Signed-off-by: Mark Brown <[email protected]> Acked-by: Jassi Brar <[email protected]> Acked-by: Liam Girdwood <[email protected]>
2011-04-27ARM: 6887/1: Mark broadcast_timer_setup() __cpuinitStephen Boyd1-1/+1
This function is only called by percpu_timer_setup() which is also __cpuinit marked. Thus it's safe to mark this function as __cpuinit as well. Signed-off-by: Stephen Boyd <[email protected]> Signed-off-by: Russell King <[email protected]>
2011-04-27ARM: 6884/1: Fix infinite loop in ARM user perf_event backtrace codeSonny Rao1-1/+2
The ARM user backtrace code can get into an infinite loop if it runs into an invalid stack frame which points back to itself. This situation has been observed in practice. Fix it by capping the number of entries in the backtrace. This is also what other architectures do in their backtrace code. Signed-off-by: Sonny Rao <[email protected]> Acked-by: Jamie Iles <[email protected]> Acked-by: Olof Johansson <[email protected]> Signed-off-by: Russell King <[email protected]>
2011-04-27nfs: don't lose MS_SYNCHRONOUS on remount of noac mountJeff Layton1-0/+9
On a remount, the VFS layer will clear the MS_SYNCHRONOUS bit on the assumption that the flags on the mount syscall will have it set if the remounted fs is supposed to keep it. In the case of "noac" though, MS_SYNCHRONOUS is implied. A remount of such a mount will lose the MS_SYNCHRONOUS flag since "sync" isn't part of the mount options. Reported-by: Max Matveev <[email protected]> Signed-off-by: Jeff Layton <[email protected]> Cc: [email protected] Signed-off-by: Trond Myklebust <[email protected]>
2011-04-27NFS: Return meaningful status from decode_secinfo()Bryan Schumaker1-4/+7
When compiling, I was getting this warning: fs/nfs/nfs4xdr.c: In function ‘decode_secinfo’: fs/nfs/nfs4xdr.c:4839:6: warning: variable ‘status’ set but not used [-Wunused-but-set-variable] We were unconditionally returning 0 as long as there wasn't an error coming out of xdr_inline_decode(). We probably want to check the error status coming out of decode_op_hdr() and decode_secinfo_gss(), rather than assuming that everything is OK all the time. Signed-off-by: Bryan Schumaker <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
2011-04-27NFSv4: Ensure we request the ordinary fileid when doing readdirplusTrond Myklebust2-17/+16
When readdir() returns a directory entry for the root of a mounted filesystem, Linux follows the old convention of returning the inode number of the covered directory (despite newer versions of POSIX declaring that this is a bug). To ensure this continues to work, the NFSv4 readdir implementation requests the 'mounted-on-fileid' from the server. However, readdirplus also needs to instantiate an inode for this entry, and for that, we also need to request the real fileid as per this patch. Signed-off-by: Trond Myklebust <[email protected]>
2011-04-27perf, x86, nmi: Move LVT un-masking into irq handlersDon Zickus3-6/+33
It was noticed that P4 machines were generating double NMIs for each perf event. These extra NMIs lead to 'Dazed and confused' messages on the screen. I tracked this down to a P4 quirk that said the overflow bit had to be cleared before re-enabling the apic LVT mask. My first attempt was to move the un-masking inside the perf nmi handler from before the chipset NMI handler to after. This broke Nehalem boxes that seem to like the unmasking before the counters themselves are re-enabled. In order to keep this change simple for 2.6.39, I decided to just simply move the apic LVT un-masking to the beginning of all the chipset NMI handlers, with the exception of Pentium4's to fix the double NMI issue. Later on we can move the un-masking to later in the handlers to save a number of 'extra' NMIs on those particular chipsets. I tested this change on a P4 machine, an AMD machine, a Nehalem box, and a core2quad box. 'perf top' worked correctly along with various other small 'perf record' runs. Anything high stress breaks all the machines but that is a different problem. Thanks to various people for testing different versions of this patch. Reported-and-tested-by: Shaun Ruffell <[email protected]> Signed-off-by: Don Zickus <[email protected]> Cc: Cyrill Gorcunov <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]> CC: Cyrill Gorcunov <[email protected]>
2011-04-27m68k/mm: Set all online nodes in N_NORMAL_MEMORYMichael Schmitz1-0/+2
For m68k, N_NORMAL_MEMORY represents all nodes that have present memory since it does not support HIGHMEM. This patch sets the bit at the time node_present_pages has been set by free_area_init_node. At the time the node is brought online, the node state would have to be done unconditionally since information about present memory has not yet been recorded. If N_NORMAL_MEMORY is not accurate, slub may encounter errors since it uses this nodemask to setup per-cache kmem_cache_node data structures. This pach is an alternative to the one proposed by David Rientjes <[email protected]> attempting to set node state immediately when bringing the node online. Signed-off-by: Michael Schmitz <[email protected]> Tested-by: Thorsten Glaser <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]> CC: [email protected]
2011-04-27ALSA - au88x0 - Add buffer bytes constraintsRaymond Yau1-2/+5
This allow application such as gstreamer and wine which use snd_pcm_hw_params_set_buffer_time_near() won't fail any more since sound chips require special containt power 2 period bytes Signed-off-by: Raymond Yau <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2011-04-27ALSA: hda - Add channel-mode support to Realtek auto-parserTakashi Iwai1-20/+249
This patch adds the support of "Channel Mode" enum control to Realtek auto-parser. When line-in or mic-in jacks are capable to output and free DACs are available, the driver allows to switch to multi-channel mode via "Channel Mode" enum switch, as already implemented in some preset cases. Not implemented in all Realtek codecs. Currently, ALC880, 882, 861, 662 and the compatible codecs are supported. Signed-off-by: Takashi Iwai <[email protected]>
2011-04-27ALSA: hda - Minor update for alc662-parser functionsTakashi Iwai1-13/+25
Allow alc662_dac_to_mix() and alc662_look_for_dac() to parse down the selector widget that is found in ALC880-type codecs, and rename them to alc_auto_*() accordingly. This is for the next coming multi-io extensions. Signed-off-by: Takashi Iwai <[email protected]>
2011-04-27Merge branch 'for_tony_a_2.6.39rc' of git://git.pwsan.com/linux-2.6 into ↵Tony Lindgren7-12/+45
devel-fixes
2011-04-27ALSA: hda - VIA: Fix Smart5.1 isn't useful for 6 audio jacks motherboard.Lydia Wang1-0/+5
For some motherboards with 5 or 6 audio jacks which had six or eight multiple channels output, smart5.1 item is no useful and should be removed. Signed-off-by: Lydia Wang <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2011-04-27Merge branch 'tip/perf/urgent' of ↵Ingo Molnar1-1/+1
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
2011-04-27drm/i915: restore only the mode of this driver on lastclose (v2)Dave Airlie5-8/+33
i915 calls the panic handler function on last close to reset the modes, however this is a really bad idea for multi-gpu machines, esp shareable gpus machines. So add a new entry point for the driver to just restore its own fbcon mode. v2: move code into fb helper, fix panic code to block mode change on powered off GPUs. [airlied: this hits drm core and I wrote it and it was reviewed on intel-gfx so really I signed it off twice ;-).] Signed-off-by: Chris Wilson <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2011-04-27Merge branch 'davinci-fixes' of ↵Russell King263-2492/+2865
git://gitorious.org/linux-davinci/linux-davinci into fixes
2011-04-27Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into fixesRussell King5-5/+24