aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-11-20drm/radeon: properly track the crtc not_enabled case evergreen_mc_stop()Alex Deucher1-0/+2
The save struct is not initialized previously so explicitly mark the crtcs as not used when they are not in use. Signed-off-by: Alex Deucher <[email protected]> Cc: [email protected]
2012-11-20KVM: taking co-maintenanceGleb Natapov1-0/+1
Updating MAINTAINERS file. Signed-off-by: Gleb Natapov <[email protected]> Signed-off-by: Avi Kivity <[email protected]>
2012-11-20KVM: Retire as maintainerAvi Kivity2-1/+5
After six and a half years of writing and maintaining KVM, it is time to move to new things. Update my MAINTAINERS entry to reflect that. Signed-off-by: Avi Kivity <[email protected]>
2012-11-20mfd: arizona: Sync regcache after resetCharles Keepax1-0/+8
In the absence of a physical reset line the chip is reset by writing the first register, which is done after the register patch has been applied. This patch synchronises the register cache after the reset to preserve any register changes that had been applied. Signed-off-by: Charles Keepax <[email protected]> Signed-off-by: Mark Brown <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2012-11-20mfd: arizona: Correctly report when AIF2/AIF1 is underclockedCharles Keepax1-2/+2
In the interrupt handler for an underclocked event, whilst checking for the source of the interrupt, AIF3 was checked twice and AIF1 was not checked. This change correctly checks the AIF1 underclocked bit and reports the correct error messages for all cases. Signed-off-by: Charles Keepax <[email protected]> Signed-off-by: Mark Brown <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2012-11-20mfd: arizona: Use correct array for ARRAY_SIZE in mfd_add_devices callCharles Keepax1-1/+1
wm5102_devs array was used for ARRAY_SIZE whilst adding the wm5110 devices. This change corrects this to get the size from the wm5110_devs array. As both arrays are the same size no issues should have been caused by this bug. Signed-off-by: Charles Keepax <[email protected]> Signed-off-by: Mark Brown <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2012-11-20mfd: wm5110: Disable control interface error report for WM5110 rev BMark Brown1-0/+1
It can misreport. Signed-off-by: Mark Brown <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2012-11-20mfd: wm5102: Update register patch for latest evaluationMark Brown1-518/+1
Latest evaluation of the device has provided some revisions to the configuration. Signed-off-by: Mark Brown <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2012-11-20ARM: EXYNOS: PL330 MDMA1 fix for revision 0 of Exynos4210 SOCBartlomiej Zolnierkiewicz2-0/+4
Commit 8214513 ("ARM: EXYNOS: fix address for EXYNOS4 MDMA1") changed EXYNOS specific setup of PL330 DMA engine to use 'non-secure' mdma1 address instead of 'secure' one (from 0x12840000 to 0x12850000) to fix issue with some Exynos4212 SOCs. Unfortunately it brakes PL330 setup for revision 0 of Exynos4210 SOC (mdma1 device cannot be found at 'non-secure' address): [ 0.566245] dma-pl330 dma-pl330.2: PERIPH_ID 0x0, PCELL_ID 0x0 ! [ 0.566278] dma-pl330: probe of dma-pl330.2 failed with error -22 Fix it by using 'secure' mdma1 address on Exynos4210 revision 0 SOC. Reviewed-by: Tomasz Figa <[email protected]> Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]> Signed-off-by: Kyungmin Park <[email protected]> Signed-off-by: Kukjin Kim <[email protected]>
2012-11-20mfd: twl-core: Fix chip ID for the twl6030-pwm modulePeter Ujfalusi1-1/+1
The correct chip id is 1 since the PWM module is on address 0x49. With the current TWL6030_MODULE_ID1 the kernel will crash early since we have: #define TWL6030_MODULE_ID1 0x0E and static struct twl_client twl_modules[4]; Down in the stack we try to get the module by: struct twl_client *twl = &twl_modules[chip]; Which is obviously going to do nasty things. Signed-off-by: Peter Ujfalusi <[email protected]> Acked-by: Tero Kristo <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2012-11-20md/raid5: round discard alignment up to power of 2.NeilBrown1-0/+4
blkdev_issue_discard currently assumes that the granularity is a power of 2. So in raid5, round the chosen number up to avoid embarrassment. Cc: Shaohua Li <[email protected]> Signed-off-by: NeilBrown <[email protected]>
2012-11-19of/net/mdio-gpio: Fix pdev->id issue when using devicetrees.Srinivas Kandagatla2-5/+15
When the mdio-gpio driver is probed via device trees, the platform device id is set as -1, However the pdev->id is re-used as bus-id for while creating mdio gpio bus. So For device tree case the mdio-gpio bus name appears as "gpio-ffffffff" where as for non-device tree case the bus name appears as "gpio-<bus-num>" Which means the bus_id is fixed in device tree case, so we can't have two mdio gpio buses via device trees. Assigning a logical bus number via device tree solves the problem and the bus name is much consistent with non-device tree bus name. Without this patch 1. we can't support two mdio-gpio buses via device trees. 2. we should always pass gpio-ffffffff as bus name to phy_connect, very different to non-device tree bus name. So, setting up the bus_id via aliases from device tree is the right solution and other drivers do similar thing. Signed-off-by: Srinivas Kandagatla <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-11-20md: make sure everything is freed when dm-raid stops an array.NeilBrown1-2/+14
md_stop() would stop an array, but not free various attached data structures. For internal arrays, these are freed later in do_md_stop() or mddev_put(), but they don't apply for dm-raid arrays. So get md_stop() to free them, and only all it from dm-raid. For internal arrays we now call __md_stop. Reported-by: majianpeng <[email protected]> Signed-off-by: NeilBrown <[email protected]>
2012-11-20md: Avoid write invalid address if read_seqretry returned true.majianpeng1-2/+2
If read_seqretry returned true and bbp was changed, it will write invalid address which can cause some serious problem. This bug was introduced by commit v3.0-rc7-130-g2699b67. So fix is suitable for 3.0.y thru 3.6.y. Reported-by: [email protected] Tested-by: [email protected] Cc: [email protected] Signed-off-by: Jianpeng Ma <[email protected]> Signed-off-by: NeilBrown <[email protected]>
2012-11-20md: Reassigned the parameters if read_seqretry returned true in func ↵majianpeng1-3/+4
md_is_badblock. This bug was introduced by commit(v3.0-rc7-126-g2230dfe). So fix is suitable for 3.0.y thru 3.6.y. Cc: [email protected] Signed-off-by: Jianpeng Ma <[email protected]> Signed-off-by: NeilBrown <[email protected]>
2012-11-20NFC: Fix pn533 target mode memory leakThierry Escande1-1/+5
In target mode, sent sk_buff were not freed in pn533_tm_send_complete Signed-off-by: Thierry Escande <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2012-11-20NFC: pn533: Fix mem leak in pn533_in_dep_link_upWaldemar Rymarkiewicz1-3/+5
cmd is allocated in pn533_dep_link_up and passed as an arg to pn533_send_cmd_frame_async together with a complete cb. arg is passed to the cb and must be kfreed there. Signed-off-by: Waldemar Rymarkiewicz <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2012-11-20NFC: pn533: Fix use after freeSzymon Janc1-6/+2
cmd was freed in pn533_dep_link_up regardless of pn533_send_cmd_frame_async return code. Cmd is passed as argument to pn533_in_dep_link_up_complete callback and should be freed there. Signed-off-by: Szymon Janc <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2012-11-20NFC: pn533: Fix missing lock while operating on commands listSzymon Janc1-1/+2
In pn533_wq_cmd command was removed from list without cmd_lock held (race with pn533_send_cmd_frame_async) which could lead to list corruption. Delete command from list before releasing lock. Signed-off-by: Szymon Janc <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2012-11-20NFC: Fix nfc_llcp_local chained list insertionThierry Escande1-1/+1
list_add was called with swapped parameters Signed-off-by: Thierry Escande <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2012-11-19ext3: Avoid underflow of in ext3_trim_fs()Lukas Czerner1-2/+3
Currently if len argument in ext3_trim_fs() is smaller than one block, the 'end' variable underflow. Avoid that by returning EINVAL if len is smaller than file system block. Also remove useless unlikely(). Signed-off-by: Lukas Czerner <[email protected]> Signed-off-by: Jan Kara <[email protected]>
2012-11-19reiserfs: Move quota calls out of write lockJan Kara3-7/+25
Calls into highlevel quota code cannot happen under the write lock. These calls take dqio_mutex which ranks above write lock. So drop write lock before calling back into quota code. CC: [email protected] # >= 3.0 Signed-off-by: Jan Kara <[email protected]>
2012-11-19reiserfs: Protect reiserfs_quota_write() with write lockJan Kara1-0/+4
Calls into reiserfs journalling code and reiserfs_get_block() need to be protected with write lock. We remove write lock around calls to high level quota code in the next patch so these paths would suddently become unprotected. CC: [email protected] # >= 3.0 Signed-off-by: Jan Kara <[email protected]>
2012-11-19reiserfs: Protect reiserfs_quota_on() with write lockJan Kara1-3/+8
In reiserfs_quota_on() we do quite some work - for example unpacking tail of a quota file. Thus we have to hold write lock until a moment we call back into the quota code. CC: [email protected] # >= 3.0 Signed-off-by: Jan Kara <[email protected]>
2012-11-19reiserfs: Fix lock ordering during remountJan Kara1-7/+20
When remounting reiserfs dquot_suspend() or dquot_resume() can be called. These functions take dqonoff_mutex which ranks above write lock so we have to drop it before calling into quota code. CC: [email protected] # >= 3.0 Signed-off-by: Jan Kara <[email protected]>
2012-11-19ALSA: hda - Limit runtime PM support only to known Intel chipsTakashi Iwai1-19/+20
We've got a report that the runtime PM may make the codec the unresponsive on AMD platforms. Since the feature has been tested only on the recent Intel platforms, it's safer to limit the support to such devices for now. This patch adds a new DCAPS bit flag indicating the runtime PM support, and mark it for Intel controllers. Reported-and-tested-by: Julian Wollrath <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2012-11-19Merge branch 'for-john' of ↵John W. Linville2-8/+14
git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes
2012-11-19Merge branch 'for-john' of ↵John W. Linville2-4/+24
git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
2012-11-19Merge tag 'davinci-fixes-for-v3.7' of ↵Olof Johansson1-2/+1
git://gitorious.org/linux-davinci/linux-davinci into fixes From Sekhar Nori: Fixes an "signal out of range" error when using enhanced definition display with a DaVinci DM644x device. * tag 'davinci-fixes-for-v3.7' of git://gitorious.org/linux-davinci/linux-davinci: ARM: davinci: dm644x: fix out range signal for ED
2012-11-19ath9k_hw: Fix regression in device resetSujith Manoharan1-1/+1
Commit "ath9k: improve suspend/resume reliability" broke ath9k_htc and bringing up the device would hang indefinitely. Fix this. Cc: [email protected] Signed-off-by: Sujith Manoharan <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2012-11-19ALSA: hda - Fix recursive suspend/resume callTakashi Iwai2-2/+10
When the bus reset is performed during the suspend/resume (including the power-saving too), it calls snd_hda_suspend() and snd_hda_resume() again, and deadlocks eventually. For avoiding the recursive call, add a new flag indicating that the PM is being performed, and don't go to the bus reset mode when it's on. Reported-and-tested-by: Julian Wollrath <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2012-11-19i2c: s3c2410: Fix code to free gpiosAbhilash Kesavan1-0/+1
Store the requested gpios so that they can be freed on error/removal. Signed-off-by: Abhilash Kesavan <[email protected]> Signed-off-by: Wolfram Sang <[email protected]>
2012-11-19Merge branch 'usb-midi-fix-3.7' of git://git.alsa-project.org/alsa-kprivate ↵Takashi Iwai1-2/+6
into for-linus Merge a regression fix for USB MIDI on non-standard usb-audio drivers by Clemens.
2012-11-19OMAPFB: Fix possible null pointer dereferencingTushar Behera1-1/+1
Commit 952cbaaa9b8beacc425f9aedf370468cbb737a2c (OMAPFB: Change dssdev->manager references) added checks for OMAPFB_WAITFORVSYNC ioctl to verify that the display, output and overlay manager exist. However, the code erroneously uses && for each part, which means that OMAPFB_WAITFORVSYNC may crash the kernel if no display, output or manager is associated with the framebuffer. This patch fixes the issue by using ||. Signed-off-by: Tushar Behera <[email protected]> Signed-off-by: Tomi Valkeinen <[email protected]>
2012-11-19ARM: davinci: dm644x: fix out range signal for EDLad, Prabhakar1-2/+1
Fix the video clock setting when custom timings are used with pclock <= 27MHz. Existing video clock selection uses PLL2 mode which results in a 54MHz clock whereas using the MXI mode results in a 27MHz clock (which is the one actually desired). This bug affects the Enhanced Definition (ED) support on DM644x. Without this patch, out-range signals errors are were observed on the TV when viewing ED. An out-of-range signal is often caused when the field rate is above the rate that the television will handle. Signed-off-by: Lad, Prabhakar <[email protected]> Signed-off-by: Manjunath Hadli <[email protected]> Cc: Sekhar Nori <[email protected]> [[email protected]: reword commit message based on on-list discussion] Signed-off-by: Sekhar Nori <[email protected]>
2012-11-18Input: mousedev - move /dev/input/mice to the correct minorDmitry Torokhov1-2/+2
When doing conversion to dynamic input numbers I inadvertently moved /dev/input/mice from c,13,63 to c,13,31. We need to fix this so that setups with statically populated /dev continue working. Tested-by: Krzysztof Mazur <[email protected]> Tested-by: Pavel Machek <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2012-11-18sparc64: not any error from do_sigaltstack() should fail rt_sigreturn()Al Viro1-3/+1
If a signal handler is executed on altstack and another signal comes, we will end up with rt_sigreturn() on return from the second handler getting -EPERM from do_sigaltstack(). It's perfectly OK, since we are not asking to change the settings; in fact, they couldn't have been changed during the second handler execution exactly because we'd been on altstack all along. 64bit sigreturn on sparc treats any error from do_sigaltstack() as "SIGSEGV now"; we need to switch to the same semantics we are using on other architectures. Cc: [email protected] Signed-off-by: Al Viro <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-11-18sis900: fix sis900_set_mode call parameters.Francois Romieu1-1/+1
Leftover of 57d6d456cfb89264f87d24f52640ede23fdf12bd ("sis900: stop using net_device.{base_addr, irq} and convert to __iomem."). It is needed for suspend / resume to work. Signed-off-by: Francois Romieu <[email protected]> Tested-by: Jan Janssen <[email protected]> Cc: Daniele Venzano <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-11-19drm/nouveau/bios: fix DCB v1.5 parsingMarcin Slusarz2-6/+10
memcmp->nv_strncmp conversion, in addition to name change, should have inverted the return value. But nv_strncmp does not act like strncmp - it does not check for string terminator, returns true/false instead of -1/0/1 and has different parameters order. Let's rename it to nv_memcmp and let it act like memcmp. Signed-off-by: Marcin Slusarz <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2012-11-19drm/nouveau: add missing pll_calc callsMaarten Lankhorst3-1/+22
Fixes a null pointer dereference when reclocking on my fermi. Signed-off-by: Maarten Lankhorst <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2012-11-19drm/nouveau: fix crash with noaccel=1Marcin Slusarz1-0/+4
Reported-by: Ortwin Glück <[email protected]> Signed-off-by: Marcin Slusarz <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2012-11-19drm/nv40: allocate ctxprog with kmallocMarcin Slusarz3-5/+13
Some archs defconfigs have CONFIG_FRAME_WARN set to 1024, which lead to this warning: drivers/gpu/drm/nouveau/core/engine/graph/ctxnv40.c: warning: the frame size of 1184 bytes is larger than 1024 bytes Reported-by: Geert Uytterhoeven <[email protected]> Signed-off-by: Marcin Slusarz <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2012-11-19drm/nvc0/disp: fix thinko in vblank regression fix..Kelly Doran1-7/+12
Signed-off-by: Ben Skeggs <[email protected]>
2012-11-18fanotify: fix FAN_Q_OVERFLOW case of fanotify_read()Al Viro1-1/+2
If the FAN_Q_OVERFLOW bit set in event->mask, the fanotify event metadata will not contain a valid file descriptor, but copy_event_to_user() didn't check for that, and unconditionally does a fd_install() on the file descriptor. Which in turn will cause a BUG_ON() in __fd_install(). Introduced by commit 352e3b249284 ("fanotify: sanitize failure exits in copy_event_to_user()") Mea culpa - missed that path ;-/ Reported-by: Alex Shi <[email protected]> Signed-off-by: Al Viro <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2012-11-18Merge branch 'for-linus' of ↵Linus Torvalds2-4/+3
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs Pull misc VFS fixes from Al Viro: "Remove a bogus BUG_ON() that can trigger spuriously + alpha bits of do_mount() constification I'd missed during the merge window." This pull request came in a week ago, I missed it for some reason. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: kill bogus BUG_ON() in do_close_on_exec() missing const in alpha callers of do_mount()
2012-11-18Merge branch 'for-linus' of ↵Linus Torvalds1-3/+3
git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k Pull m68k fix from Geert Uytterhoeven: "This is a bug fix for asm constraints that affect sending RT signals, also destined for -stable." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k: fix sigset_t accessor functions
2012-11-18Merge tag 'gpio-fixes-for-v3.7' of ↵Linus Torvalds3-4/+27
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio Pull last minute GPIO fixes from Linus Walleij: - Disable blinking on the Orion GPIO driver - Two Kconfig-style fixes to avoid broken builds * tag 'gpio-fixes-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: gpio-mcp23s08: Build I2C support even when CONFIG_I2C=m gpio: adnp: Depend on OF_GPIO instead of OF mvebu-gpio: Disable blinking when enabling a GPIO for output
2012-11-18Merge tag 'for-linus-v3.7-rc7' of git://oss.sgi.com/xfs/xfsLinus Torvalds3-19/+69
Pull xfs bugfixes from Ben Myers: - fix attr tree double split corruption - fix broken error handling in xfs_vm_writepage - drop buffer io reference when a bad bio is built * tag 'for-linus-v3.7-rc7' of git://oss.sgi.com/xfs/xfs: xfs: drop buffer io reference when a bad bio is built xfs: fix broken error handling in xfs_vm_writepage xfs: fix attr tree double split corruption
2012-11-18Merge tag 'upstream-linus' of ↵Linus Torvalds6-7/+57
git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev Pull libata fixes from Jeff Garzik: "If you were going to shoot me for not sending these earlier, you would be right. -rc6 beat me by ~2 hours it seems, and they really should have gone out long before that. These have been in libata-dev.git for a day or so (unfortunately linux-next is on vacation). The main one is #1, with the others being minor bits. #1 has multiple tested-by, and can be considered a regression fix IMO. 1) Fix ACPI oops: https://bugzilla.kernel.org/show_bug.cgi?id=48211 2) Temporary WARN_ONCE() debugging patch for further ACPI debugging. The code already oopses here, and so this merely gives slightly better info. Related to https://bugzilla.kernel.org/show_bug.cgi?id=49151 which has been bisected down to a patch that _exposes_ a latest bug, but said bisection target does not actually appear to be the root cause itself. 3) sata_svw: fix longstanding error recovery bug, which was preventing kdump, by adding missing DMA-start bit check. Core code was already checking DMA-start, but ancillary, less-used routines were not. Fixed. 4) sata_highbank: fix minor __init/__devinit warning 5) Fix minor warning, if CONFIG_PM is set, but CONFIG_PM_SLEEP is not set 6) pata_arasan: proper functioning requires clock setting" * tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: [libata] PM callbacks should be conditionally compiled on CONFIG_PM_SLEEP sata_svw: check DMA start bit before reset libata debugging: Warn when unable to find timing descriptor based on xfer_mode sata_highbank: mark ahci_highbank_probe as __devinit pata_arasan: Initialize cf clock to 166MHz libata-acpi: Fix NULL ptr derference in ata_acpi_dev_handle
2012-11-18ALSA: ua101, usx2y: fix broken MIDI outputClemens Ladisch1-2/+6
Commit 88a8516a2128 (ALSA: usbaudio: implement USB autosuspend) added autosuspend code to all files making up the snd-usb-audio driver. However, midi.c is part of snd-usb-lib and is also used by other drivers, not all of which support autosuspend. Thus, calls to usb_autopm_get_interface() could fail, and this unexpected error would result in the MIDI output being completely unusable. Make it work by ignoring the error that is expected with drivers that do not support autosuspend. Reported-by: Colin Fletcher <[email protected]> Reported-by: Devin Venable <[email protected]> Reported-by: Dr Nick Bailey <[email protected]> Reported-by: Jannis Achstetter <[email protected]> Reported-by: Rui Nuno Capela <[email protected]> Cc: Oliver Neukum <[email protected]> Cc: 2.6.39+ <[email protected]> Signed-off-by: Clemens Ladisch <[email protected]>