aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-01-31[media] hdpvr: fix up i2c device registrationJarod Wilson3-16/+41
We have to actually call i2c_new_device() once for each of the rx and tx addresses. Also improve error-handling and device remove i2c cleanup. Reviewed-by: Andy Walls <[email protected]> Signed-off-by: Jarod Wilson <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-01-31[media] rc/mce: add mappings for missing keysJarod Wilson1-0/+6
Per http://mediacenterguides.com/book/export/html/31 and investigation by Erin, we were missing these last three mappings to complete the mce key table. Lets remedy that. Reported-by: Erin Simonds <[email protected]> Signed-off-by: Jarod Wilson <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-01-31[media] gspca - zc3xx: Discard the partial framesJean-François Moine1-2/+10
In some cases, some frames may not end with the JPEG end of frame. Being not complete, they are now discarded. Signed-off-by: Jean-François Moine <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-01-31[media] gspca - zc3xx: Fix bad images with the sensor hv7131rJean-François Moine1-2/+15
The problem was introduced by the commit 2af0b4c60cc0daf0. Some registers were no more initialized. Tested-by: <Giovanni Scafora [email protected]> Tested-by: <Sergey Manucharian [email protected]> Signed-off-by: Jean-François Moine <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-01-31[media] gspca - zc3xx: Bad delay when given by a tableJean-François Moine1-1/+1
Signed-off-by: Jean-François Moine <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2011-01-31drm/i915: Suppress spurious vblank interruptsChris Wilson3-8/+9
Hugh Dickins found that characters in xterm were going missing and oft delayed. Being the curious type, he managed to associate this with the new high-precision vblank patches; disabling these he found, restored the orderliness of his characters. The oddness begins when one realised that Hugh was not using vblanks at all on his system (fvwm and some xterms). Instead, all he had to go on were warning of a pipe underrun, curiously enough at around 60Hz. He poked and found that in addition to the underrun warning, the hardware was flagging the start of a new frame, a vblank, which in turn was kicking off the pending vblank processing code. There is little we can do for the underruns on Hugh's machine, a Crestline [965GM], which must have its FIFO watermarks set to 8. However, we do not need to process the vblank if we know that they are disabled... Reported-by: Hugh Dickins <[email protected]> Signed-off-by: Chris Wilson <[email protected]>
2011-01-31drm: Avoid leak of adjusted mode along quick set_mode pathsChris Wilson1-5/+3
Signed-off-by: Chris Wilson <[email protected]>
2011-01-31drm: Simplify and defend later checks when disabling a crtcChris Wilson1-3/+6
By setting the FB of a CRTC to NULL, we are turning off the CRTC (and so disable the unused encoders and connectors). As such we can simplify the later tests by making sure the set->mode is NULL. Setting the num_connectors to zero means that we do not need to loop over the unused connectors. All current usage appears correct, this only builds additional defense into the routine. References: https://bugzilla.kernel.org/show_bug.cgi?id=27722 Tested-by: Takashi Iwai <[email protected]> Signed-off-by: Chris Wilson <[email protected]>
2011-01-31drm: Don't switch fb when disabling an outputChris Wilson1-2/+2
In drm_crtc_helper_set_config, we call drm_crtc_helper_set_mode which may return early and do no operation if the crtc is to be disabled. In this case we merrily swap to the new fb, discarding the old_fb believing that it has been cleaned up. However, due to the early return, the old_fb was not presented to the backend for correct reaping, and nor was the new one - which is about to be reaped via the drm_helper_disable_unused_functions(), leading to incorrect refcounting of the pinned objects. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=27722 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=29857 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=29230 Tested-by: Takashi Iwai <[email protected]> Signed-off-by: Chris Wilson <[email protected]>
2011-01-31watchdog: Don't change watchdog state on read of sysctlMarcin Slusarz1-4/+6
Signed-off-by: Marcin Slusarz <[email protected]> [ add {}'s to fix a warning ] Signed-off-by: Don Zickus <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Frederic Weisbecker <[email protected]> Cc: <[email protected]> LKML-Reference: <[email protected]> Signed-off-by: Ingo Molnar <[email protected]>
2011-01-31watchdog: Fix sysctl consistencyMarcin Slusarz1-6/+7
If it was not possible to enable watchdog for any cpu, switch watchdog_enabled back to 0, because it's visible via kernel.watchdog sysctl. Signed-off-by: Marcin Slusarz <[email protected]> Signed-off-by: Don Zickus <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Frederic Weisbecker <[email protected]> Cc: <[email protected]> LKML-Reference: <[email protected]> Signed-off-by: Ingo Molnar <[email protected]>
2011-01-31watchdog: Fix broken nowatchdog logicMarcin Slusarz1-14/+6
Passing nowatchdog to kernel disables 2 things: creation of watchdog threads AND initialization of percpu watchdog_hrtimer. As hrtimers are initialized only at boot it's not possible to enable watchdog later - for me all watchdog threads started to eat 100% of CPU time, but they could just crash. Additionally, even if these threads would start properly, watchdog_disable_all_cpus was guarded by no_watchdog check, so you couldn't disable watchdog. To fix this, remove no_watchdog variable and use already existing watchdog_enabled variable. Signed-off-by: Marcin Slusarz <[email protected]> [ removed another no_watchdog instance ] Signed-off-by: Don Zickus <[email protected]> Cc: Stephane Eranian <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Frederic Weisbecker <[email protected]> Cc: <[email protected]> LKML-Reference: <[email protected]> Signed-off-by: Ingo Molnar <[email protected]>
2011-01-31Merge branch 'dmaengine-shawn' into dmaengineSascha Hauer1-10/+6
2011-01-31Merge branch 'dmaengine-sdma' into dmaengineSascha Hauer1-25/+35
2011-01-31dmaengine: imx-sdma: fix up param for the last BD in sdma_prep_slave_sg()Shawn Guo1-1/+4
As per the reference manual, bit "L" should be set while bit "C" should be cleared for the last buffer descriptor in the non-cyclic chain, so that sdma can stop trying to find the next BD and end the transfer. In case of sdma_prep_slave_sg(), BD_LAST needs to be set and BD_CONT be cleared for the last BD. Signed-off-by: Shawn Guo <[email protected]> Signed-off-by: Sascha Hauer <[email protected]>
2011-01-31dmaengine: imx-sdma: correct sdmac->status in sdma_handle_channel_loop()Shawn Guo1-1/+1
sdma_handle_channel_loop() is the handler of cyclic tx. One period success does not really mean the success of the tx. Instead of DMA_SUCCESS, DMA_IN_PROGRESS should be the one to tell. Signed-off-by: Shawn Guo <[email protected]> Signed-off-by: Sascha Hauer <[email protected]>
2011-01-31dmaengine: imx-sdma: return sdmac->status in sdma_tx_status()Shawn Guo1-3/+1
The sdmac->status was designed to reflect the status of the tx, so simply return it in sdma_tx_status(). Then dma client can call dma_async_is_tx_complete() to know the status of the tx. Signed-off-by: Shawn Guo <[email protected]> Signed-off-by: Sascha Hauer <[email protected]>
2011-01-31dmaengine: imx-sdma: set sdmac->status to DMA_ERROR in err_out of ↵Shawn Guo1-0/+1
sdma_prep_slave_sg() sdma_prep_dma_cyclic() sets sdmac->status to DMA_ERROR in err_out, and sdma_prep_slave_sg() needs to do the same. Otherwise, sdmac->status stays at DMA_IN_PROGRESS, which will make the function return immediately next time it gets called. Signed-off-by: Shawn Guo <[email protected]> Signed-off-by: Sascha Hauer <[email protected]>
2011-01-31dmaengine: imx-sdma: remove IMX_DMA_SG_LOOP handling in sdma_prep_slave_sg()Shawn Guo1-6/+0
This is a leftover from the time that the driver did not have sdma_prep_dma_cyclic callback and implemented sound dma as a looped sg chain. And it can be removed now. Signed-off-by: Shawn Guo <[email protected]> Signed-off-by: Sascha Hauer <[email protected]>
2011-01-31dmaengine i.MX dma: initialize dma capabilities outside channel loopSascha Hauer1-3/+3
The capabilities are device specific fields, not channel specific fields. Signed-off-by: Sascha Hauer <[email protected]>
2011-01-31dmaengine i.MX DMA: do not initialize chan_id fieldSascha Hauer1-1/+0
Signed-off-by: Sascha Hauer <[email protected]>
2011-01-31dmaengine i.MX dma: check sg entries for valid addresses and lengthsSascha Hauer1-0/+15
Signed-off-by: Sascha Hauer <[email protected]>
2011-01-31dmaengine i.MX dma: set maximum segment size for our deviceSascha Hauer1-0/+4
Signed-off-by: Sascha Hauer <[email protected]>
2011-01-31dmaengine i.MX SDMA: reserve channel 0 by not registering itSascha Hauer1-18/+12
We need channel 0 of the sdma engine for internal purposes. We accomplished this by calling dma_request_channel() in the probe function. This does not work when multiple dma engines are present which is the case when IPU support for i.MX31/35 is compiled in. So instead of registering channel 0 and reserving it afterwards simply do not register it in the first place. With this the dmaengine channel counting does not match sdma channel counting anymore, so we have to use sdma channel counting in the driver. Signed-off-by: Sascha Hauer <[email protected]>
2011-01-31dmaengine i.MX SDMA: initialize dma capabilities outside channel loopSascha Hauer1-3/+3
The capabilities are device specific fields, not channel specific fields. Signed-off-by: Sascha Hauer <[email protected]>
2011-01-31dmaengine i.MX SDMA: do not initialize chan_id fieldSascha Hauer1-1/+0
This is bogus as the dmaengine core will overwrite this field. Signed-off-by: Sascha Hauer <[email protected]>
2011-01-31dmaengine i.MX sdma: check sg entries for valid addresses and lengthsSascha Hauer1-3/+17
This patch lets sdma_prep_slave_sg fail if the entries of an sg list do not start on multiples of the word size or if the lengths are not multiple of the word size. Also, catch the previously unhandled DMA_SLAVE_BUSWIDTH_8_BYTES and DMA_SLAVE_BUSWIDTH_UNDEFINED cases. Signed-off-by: Sascha Hauer <[email protected]>
2011-01-31dmaengine i.MX sdma: set maximum segment size for our deviceSascha Hauer1-0/+3
Signed-off-by: Sascha Hauer <[email protected]>
2011-01-31Merge branch 'topic/hda' into fix/hdaTakashi Iwai2-63/+79
2011-01-31ALSA: oxygen: fix output routing on Xonar DGClemens Ladisch3-0/+40
This card uses separate I2S outputs for the front speakers and headphones, and reverses the order of the three speaker outputs. To work around this, add a model-specific callback to adjust the controller's playback routing. Signed-off-by: Clemens Ladisch <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2011-01-31ARM: io: ensure inb/outb() et.al. are properly ordered on ARMv6+Russell King1-16/+17
Ensure that the ISA/PCI IO space accessors are properly ordered on ARMv6+ architectures. These should always be ordered with respect to all other accesses. This also fixes __iormb() and __iowmb() not being visible to ioread/ iowrite if a platform defines its own MMIO accessors. Signed-off-by: Russell King <[email protected]>
2011-01-31ARM: initrd: disable initrd if passed address overlaps reserved regionRussell King1-0/+6
Disable the initrd if the passed address already overlaps the reserved region. This avoids oopses on Netwinders when NeTTrom tells the kernel that an initrd is located at mem+4MB, but this overlaps the BSS, resulting in the kernels in-use BSS being freed. This should be applied to v2.6.37-stable. Cc: <[email protected]> Signed-off-by: Russell King <[email protected]>
2011-01-31ARM: footbridge: fix debug macrosRussell King1-2/+2
0ea1293 (arm: return both physical and virtual addresses from addruart) changed the way the 'addruart' worked, making it return both the virt and phys addresses. Unfortunately, for footbridge, these were reversed. Fix that. Tested on Netwinder. Signed-off-by: Russell King <[email protected]>
2011-01-31ARM: mmci: round down the bytes transferred on errorRussell King1-3/+4
We should not report incomplete blocks on error. Return the number of bytes successfully transferred, rounded down to the nearest block. Acked-by: Linus Walleij <[email protected]> Signed-off-by: Russell King <[email protected]>
2011-01-31ARM: mmci: complete the transaction on errorRussell King1-1/+1
When we encounter an error, make sure we complete the transaction otherwise we'll leave the request dangling. Acked-by: Linus Walleij <[email protected]> Signed-off-by: Russell King <[email protected]>
2011-01-31[S390] reset default for CONFIG_CHSC_SCHSebastian Ott1-1/+1
6f9a3c33 "[S390] cleanup s390 Kconfig" accidentally changed the default for CONFIG_CHSC_SCH. Reset it to m. Signed-off-by: Sebastian Ott <[email protected]> Signed-off-by: Martin Schwidefsky <[email protected]>
2011-01-31[S390] qdio: prevent compile warning under CONFIG_32BITJan Glauber1-2/+2
Prevent the following compiler warning if compiling a 31 bit kernel: drivers/s390/cio/qdio_main.c: In function ‘get_outbound_buffer_frontier’: drivers/s390/cio/qdio_main.c:646:16: warning: ‘state’ may be used uninitialized in this function CC lib/radix-tree.o CC drivers/s390/scsi/zfcp_cfdc.o drivers/s390/cio/qdio_main.c: In function ‘qdio_inbound_q_moved’: drivers/s390/cio/qdio_main.c:479:16: warning: ‘state’ may be used uninitialized in this function drivers/s390/cio/qdio_main.c:479:16: note: ‘state’ was declared here Signed-off-by: Jan Glauber <[email protected]> Signed-off-by: Martin Schwidefsky <[email protected]>
2011-01-31[S390] use asm-generic/cacheflush.hAkinobu Mita1-22/+1
The implementation of the cache flushing interfaces on the s390 is identical with the default implementation in asm-generic. Signed-off-by: Akinobu Mita <[email protected]> Signed-off-by: Martin Schwidefsky <[email protected]>
2011-01-31[S390] tlb: fix build error caused by THPHeiko Carstens1-0/+1
Fix this build error with !CONFIG_SWAP caused by tranparent huge pages support: In file included from mm/pgtable-generic.c:9:0: /linux-2.6/arch/s390/include/asm/tlb.h: In function 'tlb_remove_page': /linux-2.6/arch/s390/include/asm/tlb.h:92:2: error: implicit declaration of function 'page_cache_release' Signed-off-by: Heiko Carstens <[email protected]> Signed-off-by: Martin Schwidefsky <[email protected]>
2011-01-31[S390] missing sacf in uaccessMartin Schwidefsky1-6/+4
The uaccess functions copy_in_user_std and clear_user_std fail to switch back from secondary space mode to primary space mode with sacf in case of an unresolvable page fault. We need to make sure that the switch back to primary mode is done in all cases, otherwise the code following the uaccess inline assembly will crash. Reported-by: Alexander Graf <[email protected]> Signed-off-by: Martin Schwidefsky <[email protected]>
2011-01-31[S390] pgtable_list corruptionMartin Schwidefsky1-1/+2
After page_table_free_rcu removed a page from the pgtable_list page_table_free better not add it again. Otherwise a page_table_alloc can reuse a page table fragment that is still in the rcu process. Signed-off-by: Martin Schwidefsky <[email protected]>
2011-01-31[S390] dasd: prevent panic with unresumed devicesStefan Haberland1-0/+6
If a device is not resumed correctly the system crashes when this device is set offline. This may happen if it gets disconnected during suspend. Check if the device is already removed from alias handling and skip these steps to prevent the kernel panic. Signed-off-by: Stefan Haberland <[email protected]> Signed-off-by: Martin Schwidefsky <[email protected]>
2011-01-31sound: silent echo'ed messages in MakefileAmerigo Wang1-2/+2
Silent these echo's, please. Signed-off-by: WANG Cong <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2011-01-31dt: Move device tree documentation out of powerpc directoryGrant Likely60-0/+0
The device tree is used by more than just PowerPC. Make the documentation directory available to all. v2: reorganized files while moving to create arch and driver specific directories. Signed-off-by: Grant Likely <[email protected]> Acked-by: Josh Boyer <[email protected]>
2011-01-30bnx2x: Update bnx2x version to 1.62.00-5Yaniv Rosner1-2/+2
Update bnx2x version to 1.62.00-5 Signed-off-by: Yaniv Rosner <[email protected]> Signed-off-by: Eilon Greenstein <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-01-30bnx2x: Fix potential link loss in multi-function modeYaniv Rosner1-7/+11
All functions on a port should be set to take the MDC/MDIO lock to avoid contention on the bus Signed-off-by: Yaniv Rosner <[email protected]> Signed-off-by: Eilon Greenstein <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-01-30bnx2x: Fix port swap for BCM8073Yaniv Rosner1-3/+6
Fix link on BCM57712 + BCM8073 when port swap is enabled. Common PHY reset was done on the wrong port. Signed-off-by: Yaniv Rosner <[email protected]> Signed-off-by: Eilon Greenstein <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-01-30bnx2x: Fix LED blink rate on BCM84823Yaniv Rosner1-0/+12
Fix blink rate of activity LED of the BCM84823 on 10G link Signed-off-by: Yaniv Rosner <[email protected]> Signed-off-by: Eilon Greenstein <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-01-30bnx2x: Remove setting XAUI low-power for BCM8073Yaniv Rosner1-44/+0
A rare link issue with the BCM8073 PHY may occur due to setting XAUI low power mode, while the PHY microcode already does that. The fix is not to set set XAUI low power mode for this PHY. Signed-off-by: Yaniv Rosner <[email protected]> Signed-off-by: Eilon Greenstein <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-01-30Merge branch 'batman-adv/merge-oopsonly' of ↵David S. Miller1-6/+8
git://git.open-mesh.org/ecsv/linux-merge
Powered by cgit, Gruvboxed by Blaster4385.