aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-04-23OMAP4: Fix for CONTROL register BaseSantosh Shilimkar1-1/+1
This patch fixes the base address of CONTROL register on OMAP4430SDP. The control base is used by peripherals like MMC1 for PBIAS configuration. Signed-off-by: Santosh Shilimkar <[email protected]> Signed-off-by: Kishore Kadiyala <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2010-04-23OMAP4-HSMMC: FIX for MMC5 Controller IRQ Basekishore kadiyala1-1/+1
This patch fixes HSMMC Controller5 IRQ Base. Signed-off-by: Kishore Kadiyala <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2010-04-23omap3: Fix EHCI port for IGEP v2 boardEnric Balletbo i Serra1-4/+4
IGEP v2 uses EHCI port 1 instead of EHCI port 2. Signed-off-by: Enric Balletbo i Serra <[email protected]> Acked-by: Felipe Balbi <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2010-04-23omap: Fix n8x0 mmc_mmc_init compile warnings and typosTony Lindgren1-9/+9
Fix warning: 'return' with a value, in function returning void in n8x0_mmc_init. Also fix a search and replace typo. Signed-off-by: Tony Lindgren <[email protected]>
2010-04-23omap2: Fix ARM processor check for 24xxTony Lindgren1-1/+1
The value to check is 7 for V6 instead. The code has been working as it falls through to 24xx code if the other checks fail. Signed-off-by: Tony Lindgren <[email protected]>
2010-04-23omap4: Fix build break when used with gcc-4.4.1 (2009-q3)Richard Woodruff2-4/+4
This patch adds argument to smc calls as gcc-4.4.1 requires it otherwise the build breaks with 2009-q3 toolchanin. arch/arm/mach-omap2/omap-headsmp.S: Assembler messages: arch/arm/mach-omap2/omap-headsmp.S:36: Error: missing expression -- `smc' arch/arm/mach-omap2/omap-headsmp.S:55: Error: missing expression -- `smc' arch/arm/mach-omap2/omap-headsmp.S:63: Error: missing expression -- `smc' make[1]: *** [arch/arm/mach-omap2/omap-headsmp.o] Error 1 Signed-off-by: Richard Woodruff <[email protected]> Signed-off-by: Santosh Shilimkar <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2010-04-23ocfs2_dlmfs: Fix math error when reading LVB.Joel Becker1-1/+1
When asked for a partial read of the LVB in a dlmfs file, we can accidentally calculate a negative count. Reported-by: Dan Carpenter <[email protected]> Cc: <[email protected]> Signed-off-by: Joel Becker <[email protected]>
2010-04-23ocfs2: Update VFS inode's id info after reflink.Tao Ma1-0/+3
In reflink we update the id info on the disk but forgot to update the corresponding information in the VFS inode. Update them accordingly when we want to preserve the attributes. Reported-by: Jeff Liu <[email protected]> Signed-off-by: Tao Ma <[email protected]> Cc: <[email protected]> Signed-off-by: Joel Becker <[email protected]>
2010-04-23ocfs2: potential ERR_PTR dereference on error pathsDan Carpenter1-0/+1
If "handle" is non null at the end of the function then we assume it's a valid pointer and pass it to ocfs2_commit_trans(); Signed-off-by: Dan Carpenter <[email protected]> Cc: <[email protected]> Signed-off-by: Joel Becker <[email protected]>
2010-04-23eeepc-laptop: add missing sparse_keymap_freeCorentin Chary1-2/+1
Also remove legacy keymap which was not used since we use sparse_keymap. Signed-off-by: Corentin Chary <[email protected]>
2010-04-23ocfs2: Add directory entry later in ocfs2_symlink() and ocfs2_mknod()Mark Fasheh1-15/+25
If we get a failure during creation of an inode we'll allow the orphan code to remove the inode, which is correct. However, we need to ensure that we don't get any errors after the call to ocfs2_add_entry(), otherwise we could leave a dangling directory reference. The solution is simple - in both cases, all I had to do was move ocfs2_dentry_attach_lock() above the ocfs2_add_entry() call. Signed-off-by: Mark Fasheh <[email protected]>
2010-04-23ocfs2: use OCFS2_INODE_SKIP_ORPHAN_DIR in ocfs2_mknod error pathLi Dongyang1-5/+11
Mark the inode with flag OCFS2_INODE_SKIP_ORPHAN_DIR in ocfs2_mknod, so we can kill the inode in case of error. [ Fixed up comment style -Mark ] Signed-off-by: Li Dongyang <[email protected]> Signed-off-by: Mark Fasheh <[email protected]>
2010-04-23ocfs2: use OCFS2_INODE_SKIP_ORPHAN_DIR in ocfs2_symlink error pathLi Dongyang1-0/+1
Mark the inode with flag OCFS2_INODE_SKIP_ORPHAN_DIR when we get an error after allocating one, so that we can kill the inode. Signed-off-by: Li Dongyang <[email protected]> Signed-off-by: Mark Fasheh <[email protected]>
2010-04-23ocfs2: add OCFS2_INODE_SKIP_ORPHAN_DIR flag and honor it in the inode wipe codeLi Dongyang3-29/+39
Currently in the error path of ocfs2_symlink and ocfs2_mknod, we just call iput with the inode we failed with, but the inode wipe code will complain because we don't add the inode to orphan dir. One solution would be to lock the orphan dir during the entire transaction, but that's too heavy for a rare error path. Instead, we add a flag, OCFS2_INODE_SKIP_ORPHAN_DIR which tells the inode wipe code that it won't find this inode in the orphan dir. [ Merge fixes and comment style cleanups -Mark ] Signed-off-by: Li Dongyang <[email protected]> Signed-off-by: Mark Fasheh <[email protected]>
2010-04-23Merge branch 'for-linus' of ↵Linus Torvalds5-10/+15
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: hda: Use STAC_DELL_M6_BOTH quirk for Dell Studio 1558 ALSA: hda: Use LPIB quirk for DG965OT board version AAD63733-203 ALSA: snd-meastro3: Ignore spurious HV interrupts during suspend / resume ALSA: snd-meastro3: Add amp_gpio quirk for Compaq EVO N600C ALSA: hda: Use ALC880_F1734 quirk for Fujitsu Siemens AMILO Xi 1526 ALSA: hda: Use STAC_DELL_M6_BOTH quirk for Dell Studio XPS 1645 ALSA: hda - Fix resume from StR of HP 2510p with docking-station
2010-04-23Cleanup generic block based fiemapJosef Bacik2-41/+56
This cleans up a few of the complaints of __generic_block_fiemap. I've fixed all the typing stuff, used inline functions instead of macros, gotten rid of a couple of variables, and made sure the size and block requests are all block aligned. It also fixes a problem where sometimes FIEMAP_EXTENT_LAST wasn't being set properly. Signed-off-by: Josef Bacik <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-04-23drm/i915: fix non-Ironlake 965 class crashesJesse Barnes1-1/+1
My PIPE_CONTROL fix (just sent via Eric's tree) was buggy; I was testing a whole set of patches together and missed a conversion to the new HAS_PIPE_CONTROL macro, which will cause breakage on non-Ironlake 965 class chips. Fortunately, the fix is trivial and has been tested. Be sure to use the HAS_PIPE_CONTROL macro in i915_get_gem_seqno, or we'll end up reading the wrong graphics memory, likely causing hangs, crashes, or worse. Reported-by: Zdenek Kabelac <[email protected]> Reported-by: Toralf Förster <[email protected]> Tested-by: Toralf Förster <[email protected]> Signed-off-by: Jesse Barnes <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-04-23Merge branch 'fix/misc' into for-linusTakashi Iwai1-0/+9
2010-04-23Merge branch 'fix/hda' into for-linusTakashi Iwai4-10/+6
2010-04-23ARM: 6030/1: KS8695: enable consoleYegor Yefremov1-0/+1
Add add_preferred_console() to ks8695_console_init() to enable the console Signed-off-by: Yegor Yefremov <[email protected]> Acked-by: Andrew Victor <[email protected]> Signed-off-by: Russell King <[email protected]>
2010-04-23mutex: Don't spin when the owner CPU is offline or other weird casesBenjamin Herrenschmidt1-4/+4
Due to recent load-balancer changes that delay the task migration to the next wakeup, the adaptive mutex spinning ends up in a live lock when the owner's CPU gets offlined because the cpu_online() check lives before the owner running check. This patch changes mutex_spin_on_owner() to return 0 (don't spin) in any case where we aren't sure about the owner struct validity or CPU number, and if the said CPU is offline. There is no point going back & re-evaluate spinning in corner cases like that, let's just go to sleep. Signed-off-by: Benjamin Herrenschmidt <[email protected]> Signed-off-by: Peter Zijlstra <[email protected]> LKML-Reference: <1271212509.13059.135.camel@pasglop> Signed-off-by: Ingo Molnar <[email protected]>
2010-04-23drm/radeon/kms/evergreen: No EnableYUV tableAlex Deucher1-1/+1
DCE4 cards don't have an EnableYUV table. Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-04-23ALSA: hda: Use STAC_DELL_M6_BOTH quirk for Dell Studio 1558Daniel T Chen1-0/+2
BugLink: https://launchpad.net/bugs/568600 The OR has verified that the dell-m6 model quirk is necessary for audio to be audible by default on the Dell Studio XPS 1645. This change is necessary for 2.6.32.11 and 2.6.33.2 alike. Reported-by: Andy Ross <[email protected]> Tested-by: Andy Ross <[email protected]> Cc: <[email protected]> Signed-off-by: Daniel T Chen <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2010-04-23ALSA: hda: Use LPIB quirk for DG965OT board version AAD63733-203Daniel T Chen1-0/+1
BugLink: https://launchpad.net/bugs/459083 The OR has verified with 2.6.32.11 and the latest alsa-driver stable daily snapshot that position_fix=1 is necessary for the external mic to work and for PulseAudio not to crash constantly. This patch is necessary also for 2.6.32.11 and 2.6.33.2. Reported-by: <[email protected]> Tested-by: <[email protected]> Cc: <[email protected]> Signed-off-by: Daniel T Chen <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2010-04-23drm/radeon/kms: HDMI irq supportChristian Koenig5-56/+112
Implements irq support for HDMI audio output. Now the polling timer is only enabled if irq support isn't available. Signed-off-by: Christian König <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-04-23drm/radeon/kms: rework audio polling timerChristian König4-26/+61
Rework HDMI audio polling timer, only enable it when at least one HDMI encoder needs it. Preparation for replacing it with irq support. Signed-off-by: Christian König <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-04-23agp: use scratch page on memory remove and at GATT creation V4Jerome Glisse9-4/+44
Convert most AGP chipset to use scratch page as default entries. This help avoiding GPU querying 0 address and trigger computer fault. With KMS and memory manager we bind/unbind AGP memory constantly and it seems that some GPU are still doing AGP traffic even after GPU report being idle with the memory segment. Tested (radeon GPU KMS + Xorg + compiz + glxgears + quake3) on : - SIS 1039:0001 & 1039:0003 - Intel 865 8086:2571 Compile tested for other bridges V2 enable scratch page on uninorth V3 fix unbound check in uninorth insert memory (Michel Dänzer) V4 rebase on top of drm-next branch with the lastest intel AGP changeset (stable should use version V3 of the patch) Signed-off-by: Jerome Glisse <[email protected]> Signed-off-by: Michel Dänzer <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-04-23drm/radeon: 9800 SE has only one quadpipeTormod Volden3-5/+15
Although these cards have 2 pipelines on the silicon only the first passed the QA and the other should be disabled. http://www.digital-daily.com/video/ati-radeon9800se/ http://www.rojakpot.com/showarticle.aspx?artno=101&pgno=1 agd5f: add some other SE cards as well; fix up kms Signed-off-by: Tormod Volden <[email protected]> Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-04-23drm/radeon/kms: don't print error for legal crtcs.Dave Airlie1-3/+3
With evergreen this is bounded by num_crtc not by 0,1. Signed-off-by: Dave Airlie <[email protected]>
2010-04-23drm/radeon/kms/evergreen: fix LUT setupAlex Deucher1-4/+4
Must have gotten broken during an earlier rebase. Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-04-22Merge branch 'upstream-linus' of ↵Linus Torvalds4-1/+14
git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: libata: ensure NCQ error result taskfile is fully initialized before returning it via qc->result_tf. libata: fix docs, RE port and device of libata.force ID separated by point pata_pcmcia/ide-cs: add IDs for transcend and kingston cards libata: fix locking around blk_abort_request()
2010-04-22tcp: bind() fix when many ports are boundEric Dumazet2-10/+21
Port autoselection done by kernel only works when number of bound sockets is under a threshold (typically 30000). When this threshold is over, we must check if there is a conflict before exiting first loop in inet_csk_get_port() Change inet_csk_bind_conflict() to forbid two reuse-enabled sockets to bind on same (address,port) tuple (with a non ANY address) Same change for inet6_csk_bind_conflict() Reported-by: Gaspar Chilingarov <[email protected]> Signed-off-by: Eric Dumazet <[email protected]> Acked-by: Evgeniy Polyakov <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-04-22libata: ensure NCQ error result taskfile is fully initializedJeff Garzik1-0/+1
before returning it via qc->result_tf. Cc: [email protected] Signed-off-by: Jeff Garzik <[email protected]>
2010-04-23squashfs: fix locking bug in zlib wrapperPhillip Lougher1-1/+2
Fix locking bug in zlib wrapper introduced by recent decompressor changes. Signed-off-by: Phillip Lougher <[email protected]>
2010-04-22libata: fix docs, RE port and device of libata.force ID separated by pointRoman Fietze1-1/+1
According to libata-core correctly around line 6572: /* parse id */ p = strchr(id, '.'); ... the optional device is separated from the port in the libata.force ID by a point or dot instead of by a colon. Fix documentation to reflect this. Signed-off-by: Roman Fietze <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2010-04-22pata_pcmcia/ide-cs: add IDs for transcend and kingston cardsKristoffer Ericson2-0/+8
This patch adds idstrings for Kingston 1GB/4GB and Transcend 4GB/8GB. Signed-off-by: Kristoffer Ericson <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2010-04-22libata: fix locking around blk_abort_request()Tejun Heo1-0/+4
blk_abort_request() expectes queue lock to be held by the caller. Grab it before calling the function. Lack of this synchronization led to infinite loop on corrupt q->timeout_list. Signed-off-by: Tejun Heo <[email protected]> Cc: Jens Axboe <[email protected]> Cc: [email protected] Signed-off-by: Jeff Garzik <[email protected]>
2010-04-22Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6Linus Torvalds16-30/+139
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: usb: Increase timeout value for device reset USB: put claimed interfaces in the "suspended" state USB: EHCI: defer reclamation of siTDs USB: fix remote wakeup settings during system sleep USB: pl2303: add AdLink ND-6530 USB IDs USB: Add id for HP ev2210 a.k.a Sierra MC5725 miniPCI-e Cell Modem. USB: OHCI: DA8xx/OMAP-L1x: fix up macro rename USB: qcaux: add LG Rumor and Sanyo Katana LX device IDs usb: wusb: don't overflow the Keep Alive IE buffer USB: ehci: omap: fix kernel panic with rmmod USB: fixed bug in usbsevseg using USB autosuspend incorrectly USB: ti_usb_3410_5052: adding multitech dialup fax/modem devices
2010-04-22Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6Linus Torvalds3-6/+9
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: sysfs: use sysfs_attr_init in ASUS atk0110 driver Documentation/HOWTO: update git home URL Documentation: -stable rules: upstream commit ID requirement reworded
2010-04-22Merge branch 'for-linus' of ↵Linus Torvalds9-42/+246
git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel: drm/i915: use PIPE_CONTROL instruction on Ironlake and Sandy Bridge drm/i915: cleanup FBC buffers at unload time drm/i915: fix tiling limits for i915 class hw v2 drm/i915: set DIDL using the ACPI video output device _ADR method return. drm/i915: Fix 82854 PCI ID, and treat it like other 85X drm/i915: Attempt to fix watermark setup on 85x (v2)
2010-04-22Merge branch 'for-linus' of git://neil.brown.name/mdLinus Torvalds1-17/+18
* 'for-linus' of git://neil.brown.name/md: md/raid5: fix previous patch.
2010-04-22omap: DMA: Init CDAC to zeromanjugk manjugk1-0/+9
The register DMA4_CDAC needs to be initialized to zero before starting DMA transfer. Cc: Santosh Shilimkar <[email protected]> Cc: Govindraj R <[email protected]> Cc: Kevin Hilman <[email protected]> Reported-by:S, Venkatraman <[email protected]> Signed-off-by: Manjunatha GK <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2010-04-22omap: gpio: fix incorrect matching of IRQ_TYPE_EDGE_BOTHJanusz Krzysztofik1-3/+3
Since IRQ_TYPE_EDGE_BOTH is defined as (IRQ_TYPE_EDGE_FALLING | IRQ_TYPE_EDGE_RISING), testing against it with a bitwise AND also matches both single-edge cases in addition to the intended both edges case. Fix it, replacing with a more accurate expression. Created and tested againts linux-2.6.34-rc3. Applicable to 2.6.33-stable as well. Signed-off-by: Janusz Krzysztofik <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2010-04-22arm: omap1: remove dead code from timer32k.cFelipe Balbi1-15/+0
Trivial patch, no functional changes Signed-off-by: Felipe Balbi <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2010-04-22omap: fix clocksource_32k to start from zeroAaro Koskinen1-5/+14
When the 32k sync timer is used for sched_clock(), it should count time from the kernel boot (clocksource init) instead of the last HW reset. Otherwise printk.time values will jump suddenly during the boot: [ 0.000000] calling omap2_clk_arch_init+0x0/0x138 @ 1 [ 0.000000] initcall omap2_clk_arch_init+0x0/0x138 returned -22 after 0 usecs [ 0.000000] initcall omap2_clk_arch_init+0x0/0x138 returned with error code -22 [ 0.000000] calling omap_init_clocksource_32k+0x0/0x98 @ 1 [ 508.697937] initcall omap_init_clocksource_32k+0x0/0x98 returned 0 after 0 usecs [ 508.697967] calling omap_init_devices+0x0/0x38 @ 1 [ 508.698425] initcall omap_init_devices+0x0/0x38 returned 0 after 0 usecs This will confuse tools such as scripts/bootgraph.pl. Signed-off-by: Aaro Koskinen <[email protected]> Acked-by: Kevin Hilman <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2010-04-22PCI: Ensure we re-enable devices on resumeMatthew Garrett1-5/+1
If the firmware puts a device back into D0 state at resume time, we'll update its state in resume_noirq and thus skip the platform resume code. Calling that code twice should be safe and we ought to avoid getting to that point anyway, so remove the check and also allow the platform pci code to be called for D0. Fixes USB not being powered after resume on recent Lenovo machines. Acked-by: Alex Chiang <[email protected]> Acked-by: Rafael J. Wysocki <[email protected]> Signed-off-by: Matthew Garrett <[email protected]> Signed-off-by: Jesse Barnes <[email protected]>
2010-04-22x86/PCI: parse additional host bridge window resource typesBjorn Helgaas1-6/+37
This adds support for Memory24, Memory32, and Memory32Fixed descriptors in PCI host bridge _CRS. I experimentally determined that Windows (2008 R2) accepts these descriptors and treats them as windows that are forwarded to the PCI bus, e.g., if it finds any PCI devices with BARs outside the windows, it moves them into the windows. I don't know whether any machines actually use these descriptors in PCI host bridge _CRS methods, but if any exist and they're new enough that we automatically turn on "pci=use_crs", they will work with Windows but not with Linux. Here are the details: https://bugzilla.kernel.org/show_bug.cgi?id=15817 Signed-off-by: Bjorn Helgaas <[email protected]> Signed-off-by: Jesse Barnes <[email protected]>
2010-04-22PCI: revert broken device warningBjorn Helgaas1-16/+7
This reverts c519a5a7dab2d. That change added a warning about devices that didn't respond correctly when sizing BARs, which helped diagnose broken devices. But the test wasn't specific enough, so it also complained about working devices with zero-size BARs, e.g., https://bugzilla.kernel.org/show_bug.cgi?id=15822 Signed-off-by: Bjorn Helgaas <[email protected]> Signed-off-by: Jesse Barnes <[email protected]>
2010-04-22rdma: potential ERR_PTR dereferenceDan Carpenter1-1/+1
In the original code, the "goto out" calls "rdma_destroy_id(cm_id);" That isn't needed here and would cause problems because "cm_id" is an ERR_PTR. The new code just returns directly. Signed-off-by: Dan Carpenter <[email protected]> Acked-by: Andy Grover <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-04-22rtnetlink: potential ERR_PTR dereferenceDan Carpenter1-2/+3
In the original code, if rtnl_create_link() returned an ERR_PTR then that would get passed to rtnl_configure_link() which dereferences it. Signed-off-by: Dan Carpenter <[email protected]> Acked-by: Patrick McHardy <[email protected]> Signed-off-by: David S. Miller <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.