aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-11-10drm/nvc0/vram: skip disabled PBFB subunitsBen Skeggs1-5/+9
Signed-off-by: Ben Skeggs <[email protected]>
2011-11-10drm/nv40/pm: fix issues on igp chipsets, which don't have memoryBen Skeggs1-5/+15
Signed-off-by: Ben Skeggs <[email protected]>
2011-11-10drm/nouveau: testing the wrong variableDan Carpenter1-1/+1
memtimings is a valid pointer here, the intent was to test for kcalloc() failure. Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2011-11-10drm/nvc0/vram: storage type 0xc3 is not compressedChristoph Bumiller1-1/+1
Signed-off-by: Christoph Bumiller <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2011-11-10drm/nv50: fix stability issue on NV86.Maxim Levitsky1-1/+1
Confirmed to fix random hangs while running all Unegine demos on NV86. Signed-off-by: Maxim Levitsky <[email protected]> Signed-off-by: Ben Skeggs <[email protected]>
2011-11-10drm/nouveau: initialize chan->fence.lock before useMarcin Slusarz2-2/+1
Fence lock needs to be initialized before any call to nouveau_channel_put because it calls nouveau_channel_idle->nouveau_fence_update which uses fence lock. BUG: spinlock bad magic on CPU#0, test/24134 lock: ffff88019f90dba8, .magic: 00000000, .owner: <none>/-1, .owner_cpu: 0 Pid: 24134, comm: test Not tainted 3.0.0-nv+ #800 Call Trace: spin_bug+0x9c/0xa3 do_raw_spin_lock+0x29/0x13c _raw_spin_lock+0x1e/0x22 nouveau_fence_update+0x2d/0xf1 nouveau_channel_idle+0x22/0xa0 nouveau_channel_put_unlocked+0x84/0x1bd nouveau_channel_put+0x20/0x24 nouveau_channel_alloc+0x4ec/0x585 nouveau_ioctl_fifo_alloc+0x50/0x130 drm_ioctl+0x289/0x361 do_vfs_ioctl+0x4dd/0x52c sys_ioctl+0x42/0x65 system_call_fastpath+0x16/0x1b It's easily triggerable from userspace. Additionally remove double initialization of chan->fence.pending. Signed-off-by: Marcin Slusarz <[email protected]> Cc: [email protected] Signed-off-by: Ben Skeggs <[email protected]>
2011-11-10drm/nv50/vram: fix incorrect detection of bank count on newer chipsetsBen Skeggs1-1/+1
NVA3+ has an extra bit here compared to NV50:NVA3 chipsets. Signed-off-by: Ben Skeggs <[email protected]>
2011-11-10drm/nv50/gr: typo fix, how about we not reset fifo during graph init?Ben Skeggs1-2/+2
Signed-off-by: Ben Skeggs <[email protected]>
2011-11-10drm/nv50/bios: fixup mpll programming from the init table parserBen Skeggs1-9/+13
Reportedly this has been causing stability and corruption issues after resuming from suspend for a few people. Signed-off-by: Ben Skeggs <[email protected]>
2011-11-10drm/nouveau: fix oops if i2c bus not found in nouveau_i2c_identify()Ben Skeggs1-1/+1
Signed-off-by: Ben Skeggs <[email protected]>
2011-11-10drm: make sure drm_vblank_init() has been called before touching vbl_lockBen Skeggs1-6/+9
Signed-off-by: Ben Skeggs <[email protected]>
2011-11-09Merge branch 'for-3.2/fixes' of ↵Olof Johansson6-12/+27
git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra into fixes
2011-11-09Btrfs: rework error handling in btrfs_mount()Ilya Dryomov1-21/+21
Commits 6c41761f and 45ea6095 introduced the possibility of NULL pointer dereference on error paths, also we would leave all devices busy and leak fs_info with all sub-structures on error when trying to mount an already mounted fs to a different directory. Fix this by doing all allocations before trying to open any of the devices, adjust error path for mount-already-mounted-fs case. Signed-off-by: Ilya Dryomov <[email protected]>
2011-11-09Btrfs: close devices on all error paths in open_ctree()Ilya Dryomov1-4/+3
Fix a bug introduced by 7e662854 where we would leave devices busy on certain error paths in open_ctree(). fs_info is guaranteed to be non-NULL now so it's safe to dereference it on all error paths. Signed-off-by: Ilya Dryomov <[email protected]>
2011-11-09Btrfs: avoid null dereference and leaks when bailing from open_ctree()Ilya Dryomov1-20/+15
Fix bugs introduced by 6c41761f. Firstly, after failing to allocate any of the tree roots (first 'goto fail' in open_ctree()) we would dereference a NULL fs_info pointer in free_fs_info(). Secondly, after failures from init_srcu_struct(), setup_bdi() and new_inode() we would leak all earlier allocated roots: fs_info fields haven't been initialized yet so free_fs_info() is rendered useless. Fix this by initializing fs_info pointer and fs_info fields before any allocations happen. Signed-off-by: Ilya Dryomov <[email protected]>
2011-11-09Btrfs: fix subvol_name leak on error in btrfs_mount()Ilya Dryomov1-1/+3
btrfs_parse_early_options() can fail due to error while scanning devices (-o device= option), but still strdup() subvol_name string: mount -o subvol=SUBV,device=BAD_DEVICE <dev> <mnt> So free subvol_name string on error. Signed-off-by: Ilya Dryomov <[email protected]>
2011-11-09Btrfs: fix memory leak in btrfs_parse_early_options()Ilya Dryomov1-0/+1
Don't leak subvol_name string in case multiple subvol= options are given. "The lastest option is effective" behavior (consistent with subvolid= and subvolrootid= options) is preserved. Signed-off-by: Ilya Dryomov <[email protected]>
2011-11-09arm/tegra: enable headphone detection gpio on seaboardYufeng Shen1-0/+1
Enable the headphone detection gpio on tegra platform. Signed-off-by: Yufeng Shen <[email protected]> Acked-by: Stephen Warren <[email protected]> Signed-off-by: Olof Johansson <[email protected]>
2011-11-09arm/dt: Fix ventana SDHCI power-gpiosStephen Warren1-2/+1
Ventana uses the same SDHCI GPIOs as Seaboard; PI6 (70) is the power GPIO for the SD port, and there is no power GPIO for the MMC chip. Signed-off-by: Stephen Warren <[email protected]> Signed-off-by: Olof Johansson <[email protected]>
2011-11-09arm/tegra: Don't create duplicate gpio and pinmux devicesStephen Warren5-10/+25
*_pinmux_init() register the GPIO and pinmux devices so that they're ready before any other device needs them. *_pinmux_init() are also called by board-dt.c in order to set up the GPIO and pinmux configurations. In this case, if we register the devices, they end up being probed once due to this registration, and a second time due to a device-tree node (or vice-versa). The second probe fails since the memory regions are already requested. Besides, we don't actually want the duplicated devices. To avoid this duplicate registration, modify *_pinmux_init() to check whether it's running on a DT machine. If not, register the pinmux devices. If so, don't register them. Finally, modify board-dt.c to call the *_pinmux_init() after all devices have been instantiated from device-tree. This allows the GPIO and pinmux devices to be instantiated and initialized before calling functions to configure the hardware. This has one disadvantage: The pinmux and GPIO initialization now happens after /all/ devices are instantiated, rather than after just gpio and pinmux but before anything else. So the correct HW configuration is not in place when e.g. the SD/MMC device is probed. Long-term, this should be solved by doing both: a) Initializing the HW state from DT nodes during GPIO and pinmux device probe. b) Using the deferred driver probe mechanism, so that drivers can defer their probe until after the gpio and pinmux drivers have probed. v2: s/int is_dt/bool is_dt/ v3: Use of_machine_is_compatible inside *_pinmux_init() rather than passing an explicit parameter into the function from outside. Signed-off-by: Stephen Warren <[email protected]> Signed-off-by: Olof Johansson <[email protected]>
2011-11-09ALSA: intel8x0: improve virtual environment detectionKonstantin Ozerkov1-10/+31
Detection code improved by PCI SSID usage. VM optimization now enabled only for known devcices (skip host devices forwarded to VM by VT-d or same kind of technology). For debug/troubleshooting purposes optimization can be forced (on/off) by module parameter: "inside_vm" (boolean). Known devices (PCI SSID): 1af4:1100: Reserved for KVM devices. Note this is not yet implemented for KVM's ICH/AC'97 emulation. 1ab8:xxxx: Parallels ICH/AC'97 emulated sound. [ fixed a minor coding-style issue by tiwai] Signed-off-by: Konstantin Ozerkov <[email protected]> Signed-off-by: Denis V. Lunev <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2011-11-09ALSA: intel8x0: move virtual environment detection code into one placeKonstantin Ozerkov1-11/+19
This is refactoring patch: preparation for add improved detection code. Now all detection code placed in one place. Signed-off-by: Konstantin Ozerkov <[email protected]> Signed-off-by: Denis V. Lunev <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2011-11-09Merge branch 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixesOlof Johansson10-27/+23
2011-11-09Merge branch 'imx/compile-fixes' of ↵Olof Johansson5-12/+6
git://git.linaro.org/people/shawnguo/linux-2.6 into fixes
2011-11-09Merge branch 'mxs/fixes' of git://git.linaro.org/people/shawnguo/linux-2.6 ↵Olof Johansson1-2/+2
into fixes
2011-11-09ARM: at91: Fix USBA gadget registrationJochen Friedrich3-3/+3
Since 193ab2a6070039e7ee2b9b9bebea754a7c52fd1b, various AT91 boards don't register USBA adapters anymore due to depending on a now non-existing symbol. Fix the symbol name. Signed-off-by: Jochen Friedrich <[email protected]> Acked-by: Nicolas Ferre <[email protected]> CC: [email protected] Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
2011-11-09atmel/spi: fix missing probeJean-Christophe PLAGNIOL-VILLARD1-2/+3
Commit 940ab889 "drivercore: Add helper macro for platform_driver boilerplate" converted this driver to use module_platform_driver, but due to the use of platform_driver_probe(), this resulted in the call to atmel_spi_probe being lost. Place the call to this function into the driver structure. fix section missmatch atmel_spi_probe is marked __init where it's supposed to be __devinit atmel_spi_remove is marked __exit where it's supposed to be __devexit Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]> Cc: Greg Kroah-Hartman <[email protected]> Cc: Grant Likely <[email protected]> Cc: Russell King - ARM Linux <[email protected]> Acked-by: Nicolas Ferre <[email protected]>
2011-11-09at91/yl-9200: Fix section mismatchJean-Christophe PLAGNIOL-VILLARD1-1/+1
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
2011-11-09at91: vmalloc fix missing AT91_VIRT_BASE defineJean-Christophe PLAGNIOL-VILLARD1-0/+2
VMALLOC_END is defined in terms of AT91_VIRT_BASE but this needs mach/hardware.h for it's definition. In file included from arch/arm/mach-at91/board-usb-a926x.c:26:0: include/linux/mm.h: In function 'is_vmalloc_addr': include/linux/mm.h:305:41: error: 'AT91_VIRT_BASE' undeclared (first use in this function) include/linux/mm.h:305:41: note: each undeclared identifier is reported only once for each function it appears in Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]> Cc: Nicolas Ferre <[email protected]> Signed-off-by: Jamie Iles <[email protected]>
2011-11-09ARM: at91: usart: drop static map regs for dbguJean-Christophe PLAGNIOL-VILLARD7-21/+14
In commit fb149f9e28354 we introduce ioremap support for static map_io, we do not need this register entry anymore. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]> Signed-off-by: Nicolas Ferre <[email protected]>
2011-11-09kbuild: Fix missing system calls check on mips.David Daney2-3/+3
Commit 5f7efb4 (Kbuild: append missing-syscalls to the default target list) broke MIPS build. Reported-tested-and-acked-by: Ralf Baechle <[email protected]> Signed-off-by: David Daney <[email protected]> Signed-off-by: Michal Marek <[email protected]>
2011-11-09ALSA: snd_usb_audio: add Logitech HD Webcam c510 to quirk-384Alexey Fisher1-0/+1
Logitech HD Webcam c510 provide wrong mixer resolution. Add it to "res = 384" quirk. Signed-off-by: Alexey Fisher <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2011-11-09ALSA: hda - fix internal mic on Dell Vostro 3500 laptopJulian Wollrath2-0/+12
Fix the not working internal mic on Dell Vostro 3500 laptop by introducing the new model dell-vostro-3500. Signed-off-by: Julian Wollrath <[email protected]> Cc: <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2011-11-09ARM: picoxcell: add extra temp register to addruartJamie Iles1-1/+1
639da5ee3 (ARM: add an extra temp register to the low level debugging addruart macro) didn't include picoxcell as it hadn't been merged at the time. Fix up the compile breakage by adding the extra temp parameter. Signed-off-by: Jamie Iles <[email protected]>
2011-11-09Merge branch 'fix/asoc' into for-linusTakashi Iwai3-15/+45
2011-11-09ALSA: HDA: Remove quirk for Toshiba T110David Henningsson1-1/+0
According to the bug reporter, model=auto is needed to make the internal microphone work. BugLink: https://bugs.launchpad.net/bugs/819699 Reported-by: Andrej (agno01) Signed-off-by: David Henningsson <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2011-11-09[libata] ahci: Add ASMedia ASM1061 supportKeng-Yu Lin2-0/+5
Signed-off-by: Keng-Yu Lin <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2011-11-09[libata] Issue SRST to Sil3726 PMPGwendal Grignou2-6/+13
Reenable sending SRST to devices connected behind a Sil3726 PMP. This allow staggered spinups and handles drives that spins up slowly. While the drives spin up, the PMP will not accept SRST. Most controller reissues the reset until the drive is ready, while some [Sil3124] returns an error. In ata_eh_error, wait 10s before reset the ATA port and try again. Signed-off-by: Gwendal Grignou <[email protected]> Acked-by: Tejun Heo <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2011-11-09sata_sis.c: trivial spelling fixChris Dunlop1-1/+1
Trivial spelling fix. Signed-off-by: Chris Dunlop <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2011-11-09ahci_platform: use dev_get_platdata()JiSheng Zhang1-2/+2
Use dev_get_platdata() to retrieve the struct ahci_platform_data data from the platform. Signed-off-by: JiSheng Zhang <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2011-11-09[libata] libata-scsi.c: Add function parameter documentationMarcos Paulo de Souza1-0/+4
Add the documentation of parameters of ata_change_queue_depth to silence the warning of make xmldocs Signed-off-by: Marcos paulo de Souza <[email protected]> Acked-by: Randy Dunlap <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2011-11-08Merge branch 'for-linus' of ↵Linus Torvalds5-0/+5
git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: drivers/media: video/a5k6aa is a module and so needs module.h mfd: fix build failures in recently added ab5500 code hwspinlock/u8500: include linux/module.h MTD: MAPS: bcm963xx-flash.c: explicitly include module.h
2011-11-08Merge branch 'for-linus' of git://neil.brown.name/mdLinus Torvalds1-6/+10
* 'for-linus' of git://neil.brown.name/md: md/raid5: STRIPE_ACTIVE has lock semantics, add barriers md/raid5: abort any pending parity operations when array fails.
2011-11-08Merge branch 'docs-move' of ↵Linus Torvalds2-142/+170
git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs * 'docs-move' of git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs: (45 commits) DocBook/drm: Clean up a todo-note DocBook/drm: `device aware' -> `device-aware' DocBook/drm: `(device|driver) specific' -> `(device|driver)-specific' DocBook/drm: Clean up the paragraph on framebuffer objects DocBook/drm: Use `; otherwise,' DocBook/drm: Better flow with `, and then' DocBook/drm: Refer to the domain-setting function as a device-specific ioctl DocBook/drm: Improve flow of GPU/CPU coherence sentence DocBook/drm: Use an <itemizelist> for fundamental GEM operations DocBook/drm: Insert a comma DocBook/drm: Use a <variablelist> for vblank ioctls DocBook/drm: Use an itemizedlist for what an encoder needs to provide DocBook/drm: Insert `the' for readability, and change `set' to `setting' DocBook/drm: Remove extraneous commas DocBook/drm: Use a colon DocBook/drm: Clarify `final initialization' via better formatting DocBook/drm: Remove redundancy DocBook/drm: Insert `it' for smooth reading DocBook/drm: The word `so-called'; I do not think it connotes what you think it connotes DocBook/drm: Use a singular subject for grammatical cleanliness ...
2011-11-08Merge branch 'for-linus' of ↵Linus Torvalds2-108/+553
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest: (21 commits) ktest: Evaluate variables entered on the command line ktest: Add variable ${PWD} ktest: Add another monitor flush before installing kernel ktest: Do not opencode reboot in grub setting ktest: Add processing of complex conditionals ktest: Fix parsing of config section lines ktest: Sort make_min_config configs by dependecies ktest: Add DEFINED keyword for IF statements ktest: Add OVERRIDE keyword to DEFAULTS section ktest: Consolidate TEST_TYPE and DEFAULT code ktest: Add INCLUDE keyword to include other config files ktest: Let IF keyword take comparisons ktest: Add IF and ELSE to config sections ktest: Do not reboot on config or build issues ktest: Add option REBOOT_SUCCESS_LINE to stop waiting after a reboot ktest: Add NO_INSTALL option to not install for a test ktest: Fail when grub menu not found ktest: Include monitor in reboot code ktest: Only need to save .config when doing mrproper ktest: Create outputdir if it does not exist ...
2011-11-08Merge branch 'pm-fixes' of ↵Linus Torvalds4-4/+5
git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm * 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: PM / OPP: Use ERR_CAST instead of ERR_PTR(PTR_ERR()) PM / devfreq: fix private_data Documentation: Fix typo in freezer-subsystem.txt PM / QoS: Set cpu_dma_pm_qos->name
2011-11-08m68k/mac: Remove mac_irq_{en,dis}able() wrappersFinn Thain3-23/+11
Signed-off-by: Finn Thain <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]>
2011-11-08m68k/irq: Remove obsolete support for user vector interrupt fixupsGeert Uytterhoeven9-20/+10
It was used on Apollo only, before its conversion to genirq. Signed-off-by: Geert Uytterhoeven <[email protected]>
2011-11-08m68k/irq: Remove obsolete m68k irq frameworkGeert Uytterhoeven13-820/+4
Signed-off-by: Geert Uytterhoeven <[email protected]>
2011-11-08m68k/q40: Convert Q40/Q60 to genirqGeert Uytterhoeven3-2/+9
q40_irq_handler() must be kept to translate ISA IRQs to the range 1-15. q40_probe_irq_o{ff,n}() become unused. Signed-off-by: Geert Uytterhoeven <[email protected]> Cc: Richard Zidlicky <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.