aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-01-09drm/radeon: double lock typo in radeon_vm_bo_rmv()Dan Carpenter1-1/+1
The second lock should be an unlock or it causes a deadlock. Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2012-01-09drm/radeon: use after free in radeon_vm_bo_add()Dan Carpenter1-1/+1
"bo_va" is dereferenced in the error message. Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2012-01-09drm/sis|via: don't return stack garbage from free_mem ioctlDaniel Vetter2-4/+2
Fallout from my "kill drm_sman" refactor. Unfortunately gcc seems to have failed me and not warned about this. Tested-by: Jakob Bornecrantz <[email protected]> (on via) Signed-off-by: Daniel Vetter <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2012-01-09drm/radeon/kms: remove pointless CS flags priority structAlex Deucher1-3/+0
Signed-off-by: Alex Deucher <[email protected]> Cc: Christian König <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2012-01-09drm/radeon/kms: check if vm is supported in VA ioctlAlex Deucher4-3/+18
Add a VM manager enabled field and use it to check if vm is enabled. Signed-off-by: Alex Deucher <[email protected]> Cc: [email protected] Signed-off-by: Dave Airlie <[email protected]>
2012-01-09Merge branches 'iommu/page-sizes' and 'iommu/group-id' into nextJoerg Roedel9-1/+155
Conflicts: drivers/iommu/amd_iommu.c drivers/iommu/intel-iommu.c include/linux/iommu.h
2012-01-09Merge branches 'iommu/fixes', 'arm/omap' and 'x86/amd' into nextJoerg Roedel39-317/+2789
Conflicts: drivers/pci/hotplug/acpiphp_glue.c
2012-01-09Merge branch 'hid-battery' of ↵Jiri Kosina4-30/+91
git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen into for-linus
2012-01-08net: sk_update_clone is only used in net/core/sock.cStephen Rothwell2-6/+6
so move it there. Fixes build errors when CONFIG_INET is not defined: In file included from include/linux/tcp.h:211:0, from include/linux/ipv6.h:221, from include/net/ipv6.h:16, from include/linux/sunrpc/clnt.h:26, from include/linux/nfs_fs.h:50, from init/do_mounts.c:20: include/net/sock.h: In function 'sk_update_clone': include/net/sock.h:1109:3: error: implicit declaration of function 'sock_update_memcg' [-Werror=implicit-function-declaration] Signed-off-by: Stephen Rothwell <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-01-08Merge branch 'next' into for-linusDmitry Torokhov11363-384093/+609829
2012-01-088139cp: fix missing napi_gro_flush.françois romieu1-0/+1
The driver uses __napi_complete and napi_gro_receive. Without it, the driver hits the BUG_ON(n->gro_list) assertion hard in __napi_complete. Signed-off-by: Francois Romieu <[email protected]> Tested-by: Marin Glibic <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2012-01-09blackfin: bf561: add adv7183 capture supportBob Liu1-0/+95
Signed-off-by: Scott Jiang <[email protected]> Signed-off-by: Bob Liu <[email protected]>
2012-01-09blackfin: bf537: add capture supportBob Liu1-0/+70
Signed-off-by: Scott Jiang <[email protected]> Signed-off-by: Bob Liu <[email protected]>
2012-01-09blackfin: bf548: add capture supportScott Jiang1-0/+69
Signed-off-by: Scott Jiang <[email protected]> Signed-off-by: Bob Liu <[email protected]>
2012-01-09blackfin: time-ts: rm unused func broadcast_timer_setup()Bob Liu1-18/+0
broadcast_timer_setup() has no user now, drop it. Signed-off-by: Bob Liu <[email protected]>
2012-01-09blackfin: i2c-lcd: change default clock rateAaron Wu2-2/+2
Change default clock rate of GPIO based I2C operation for BF533 and BF561 to bring up the I2C interface LCD display Signed-off-by: Aaron Wu <[email protected]> Signed-off-by: Bob Liu <[email protected]>
2012-01-09blackfin: mac: dsa: add vlan mask in board fileSteven Miao1-0/+2
Else push file through ftp/rcp will fail. Signed-off-by: Steven Miao <[email protected]> Signed-off-by: Bob Liu <[email protected]>
2012-01-09blackfin: bf537: change num_chipselect for spi-sportScott Jiang1-2/+2
spi sport driver can support any gpio as its cs pin. Signed-off-by: Scott Jiang <[email protected]> Signed-off-by: Bob Liu <[email protected]>
2012-01-09blackfin: serial: bfin-uart: remove unused fieldSonic Zhang1-3/+0
Remove unused field for hardware flow control. Signed-off-by: Sonic Zhang <[email protected]> Signed-off-by: Bob Liu <[email protected]>
2012-01-09bf54x: get mem size: missing break in switchSteven Miao1-4/+12
Signed-off-by: Steven Miao <[email protected]> Signed-off-by: Bob Liu <[email protected]>
2012-01-09blackfin: smp: fix msg queue overflow issueSteven Miao1-5/+3
disable preemption when icache flush and use wait mode cross call, hold the msg queue lock while handle cross function call to avoid overflow Signed-off-by: Steven Miao <[email protected]> Signed-off-by: Bob Liu <[email protected]>
2012-01-09blackfin: config: update macro SPI_BFIN in board fileSonic Zhang26-64/+64
Macro name for spi controller driver has been modified, so update default board file accordingly. Signed-off-by: Sonic Zhang <[email protected]> Signed-off-by: Bob Liu <[email protected]>
2012-01-09blackfin: config: update def config for all boardsScott Jiang27-27/+27
Config name for spi controller driver has been modified in previous commit, so update default config accordingly. Signed-off-by: Scott Jiang <[email protected]> Signed-off-by: Bob Liu <[email protected]>
2012-01-09blackfin: smp: cleanup smp codeBob Liu6-16/+77
move idle task point to percpu blackfin_cpudata and add smp_timer_broadcast interface. enable SUPPLE_1_WAKEUP and add BFIN_IPI_TIMER ipi support. Signed-off-by: Steven Miao <[email protected]> Signed-off-by: Bob Liu <[email protected]>
2012-01-09blackfin: smp: add suspend and wakeup irq flagsBob Liu1-1/+2
Add IRQF_NO_SUSPEND | IRQF_FORCE_RESUME to irq flags, supplement irq should not be disabled when system do suspend. Signed-off-by: Steven Miao <[email protected]> Signed-off-by: Bob Liu <[email protected]>
2012-01-09blackfin: bf533-stamp: add missed patches for new asoc driverBob Liu1-8/+160
ASoC drivers changed between 2.6.37 and 3.0, but we didn't apply these changes in bf533 board file. So apply missed patches for asoc since 2.6.37 together. Signed-off-by: Scott Jiang <[email protected]> Signed-off-by: Bob Liu <[email protected]>
2012-01-09blackfin: bf533-stamp: fix ad1836 nameBob Liu1-2/+3
The ASoC codec name is "ad1836" and not "ad183x" as the change to rename things ultimately did not get merged. Signed-off-by: Scott Jiang <[email protected]> Signed-off-by: Bob Liu <[email protected]>
2012-01-09sh: add platform_device for renesas_usbhs in board-sh7757lcrShimoda, Yoshihiro1-0/+39
Signed-off-by: Yoshihiro Shimoda <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2012-01-09sh: modify clock-sh7757 for renesas_usbhsShimoda, Yoshihiro1-1/+1
The renesas_usbhs driver doesn't use the clk functions. So, even if we adds "CLKDEV_DEV_ID("renesas_usbhs.0", ...)" only, we cannot use the USB controller because clk_late_init() will disable the clock by "usb0". So, the patch also removes the "CLKDEV_CON_ID("usb0", ...)". Signed-off-by: Yoshihiro Shimoda <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2012-01-09Merge branch 'master' of ↵Paul Mundt5093-131494/+187047
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into sh-latest Conflicts: arch/arm/mach-shmobile/clock-sh73a0.c Signed-off-by: Paul Mundt <[email protected]>
2012-01-08ext[34]: avoid i_nlink warnings triggered by drop_nlink/inc_nlink kludge in ↵Al Viro2-2/+2
symlink() Both ext3 and ext4 put the half-created symlink inode into the orphan list for a while (see the comment in ext[34]_symlink() for gory details). Then, if everything went fine, they pull it out of the orphan list and bump the link count back to 1. The thing is, inc_nlink() is going to complain about seeing somebody changing i_nlink from 0 to 1. With a good reason, since normally something like that is a bug. Explicit set_nlink(inode, 1) does the same thing as inc_nlink() here, but it does *not* complain - exactly because it should be usable in strange situations like this one. Signed-off-by: Al Viro <[email protected]>
2012-01-08exofs: oops after late failure in mountAl Viro1-0/+2
We have already set ->s_root, so ->put_super() is going to be called. Freeing ->s_fs_info is a bloody bad idea when it's going to be dereferenced very shortly... Signed-off-by: Al Viro <[email protected]>
2012-01-08devpts: fix double-free on mount failureAl Viro1-3/+1
devpts_kill_sb() is called even if devpts_fill_super() fails; we should not do that kfree() in the latter, especially not with ->s_fs_info left pointing to freed object. Double kfree() is a Bad Thing(tm)... Signed-off-by: Al Viro <[email protected]>
2012-01-08... and the same for gadgetfsAl Viro1-15/+11
Signed-off-by: Al Viro <[email protected]>
2012-01-08functionfs: unfuck failure exits on mountAl Viro1-20/+11
* if you do dput() of root dentry, do *not* follow that with iput() of root inode. * while we are at it, don't do that dput() at all - you are leaving the pointer in ->s_root and your ->kill_sb() will be very unhappy with that. It will do proper dput(), though, so the easiest way is to leave that to it entirely. * freeing ->s_fs_info is also best left to ->kill_sb() (which will do it anyway), especially since we leave the pointer in place. * that xchg() in ->kill_sb() is not a bug per se, but it's a plain and simple masturbation with fewer excuses than Onan had... Signed-off-by: Al Viro <[email protected]>
2012-01-08ahci: support the STA2X11 I/O HubAlessandro Rubini1-5/+21
The AHCI controller found in the STA2X11 chip uses BAR number 0 instead of 5. Also, the chip's fixup code sets a special DMA mask for all of its PCI functions, and the mask must be preserved here. Signed-off-by: Alessandro Rubini <[email protected]> Acked-by: Giancarlo Asnaghi <[email protected]> Cc: Alan Cox <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2012-01-08pata_bf54x: fix BMIDE status register emulationSergei Shtylyov1-18/+2
The author of this driver clearly wasn't familiar with the BMIDE specification (also known as SFF-8038i) when he implemented the bmdma_status() method: first, the interrupt bit of the BMIDE status register corresponds to nothing else but INTRQ signal (ATAPI_DEV_INT here); second, the error bit is only set if the controller encounters issue doing the bus master transfers, not on the IDE DMA burst termination interrupts like here (moreover, setting the error bit doesn't cause an interrupt). We now need to disable all those unused interrupts... (The only thing I couldn't figure out is how to flush the FIFO to memory once the interrupt happens as required by the mentioned spec.) Signed-off-by: Sergei Shtylyov <[email protected]> Signed-off-by: Sonic Zhang <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2012-01-08ata: add ata port hibernate callbacksLin Ming1-4/+36
Signed-off-by: Lin Ming <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2012-01-08ata: update ata port's runtime status during system resumeLin Ming1-2/+16
The ata port is brought back to full power state during system resume. So its runtime PM status will have to be updated to reflect the actual post-system sleep status. This also fixes below warning during system suspend/resume. WARNING: at /work/linux/drivers/ata/libata-eh.c:4034 ata_scsi_port_error_handler+0x89/0x557() 4034 WARN_ON(!(ap->pflags & ATA_PFLAG_SUSPENDED)); Signed-off-by: Lin Ming <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2012-01-08[SCSI] runtime resume parent for child's system-resumeLin Ming1-1/+10
[Patch description from Alan Stern] If a child device was runtime-suspended when a system suspend began, then there will be nothing to prevent its parent from runtime-suspending as soon as it is woken up during the system resume. Then when the time comes to resume the child, the resume will fail because the parent is already back at low power. On the other hand, there are some devices which should remain at low power across an entire suspend-resume cycle. The details depend on the device and the platform. This suggests that the PM core is not the right place to solve the problem. One possible solution is for the subsystem or device driver to call pm_runtime_get_sync(dev->parent) at the start of the system-resume procedure and pm_runtime_put_sync(dev->parent) at the end. Acked-by: Alan Stern <[email protected]> Signed-off-by: Lin Ming <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2012-01-08ahci: platform support for suspend/resumeBrian Norris2-0/+70
Add platform hooks for custom suspend() and resume() functions. The generic suspend/resume code in drivers/ata/ahci_platform.c is adapted from the PCI version in drivers/ata/ahci.c. Signed-off-by: Brian Norris <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2012-01-08libata-core: kill duplicate statement in ata_do_set_mode()Sergei Shtylyov1-2/+2
Commit b3a706014e56b1356e7b275fd25b833c63175bf0 (libata: Add a drivers/ide style DMA disable) neglected to remove the line in ata_do_set_mode() it has obviously made useless/duplicated. Do this now, and make a line added back then wrapped properly... Signed-off-by: Sergei Shtylyov <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2012-01-08pata_of_platform: remove direct dependency on OF_IRQRob Herring2-10/+7
CONFIG_OF_IRQ is not available on some platforms and using of_irq_* breaks the build. Since resources are already populated in the platform device, get the irq from there instead. Reported-by: David S. Miller <[email protected]> Signed-off-by: Rob Herring <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2012-01-08SATA/PATA: convert drivers/ata/* to use module_platform_driver()Axel Lin12-158/+13
This patch converts the drivers in drivers/ata/* to use the module_platform_driver() macro which makes the code smaller and a bit simpler. Cc: Viresh Kumar <[email protected]> Cc: Jeff Garzik <[email protected]> Cc: Arnaud Patard <[email protected]> Cc: Alessandro Zummo <[email protected]> Cc: Sylvain Munaut <[email protected]> Cc: Anton Vorontsov <[email protected]> Cc: Marek Vasut <[email protected]> Cc: Florian Fainelli <[email protected]> Cc: Mark Miesfeld <[email protected]> Cc: Ashish Kalra <[email protected]> Cc: Paul Mundt <[email protected]> Signed-off-by: Axel Lin <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2012-01-08pata_cs5536: forward port changes from cs5536Bartlomiej Zolnierkiewicz1-57/+42
* Fix cable detection to also account for the slave device cable bit. * Disable UDMA when programming MWDMA in cs5536_set_dmamode(). * Don't change UDMA settings in cs5536_set_piomode(). * Add cs5536_program_dtc() helper. * Cleanup and uninline cs5536_[read,write]() methods. Cc: Martin K. Petersen <[email protected]> Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2012-01-08libata-sff: use ATAPI_{COD|IO}Sergei Shtylyov1-2/+2
atapi_pio_bytes() uses bare numbers for the ATAPI interrupt reason bits despite these are #define'd in <linux/ata.h>. Signed-off-by: Sergei Shtylyov <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2012-01-08ata: add ata port runtime PM callbacksLin Ming3-0/+15
Add ata port runtime suspend/resume/idle callbacks. Set ->eh_noresume to skip the runtime PM calls on scsi host in the error handler to avoid dead lock. Acked-by: Tejun Heo <[email protected]> Signed-off-by: Lin Ming <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2012-01-08ata: add ata port system PM callbacksLin Ming3-70/+76
Change ata_host_request_pm to ata_port_request_pm which performs port suspend/resume. Add ata port type driver which implements port PM callbacks. Signed-off-by: Lin Ming <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2012-01-08[SCSI] sd: check runtime PM status in sd_shutdownLin Ming1-0/+5
sd_shutdown is called during reboot/poweroff. It may fail if parent device, for example, ata port, was runtime suspended. Fix it by checking runtime PM status of sd. Exit immediately if sd was runtime suspended already. Acked-by: Alan Stern <[email protected]> Signed-off-by: Lin Ming <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2012-01-08[SCSI] check runtime PM status in system PMLin Ming1-1/+15
The only high-level SCSI driver that currently implements runtime PM is sd, and sd treats runtime suspend exactly the same as the SUSPEND and HIBERNATE stages of system sleep, but not the same as the FREEZE stage. Therefore, when entering the SUSPEND or HIBERNATE stages of system sleep, we can skip the callback to the driver if the device is already in runtime suspend. When entering the FREEZE stage, however, we should first issue a runtime resume. The overhead of doing this is negligible, because a suspended drive would be spun up during the THAW stage of hibernation anyway. Signed-off-by: Lin Ming <[email protected]> Signed-off-by: Alan Stern <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.