1. 24 Mar, 2011 34 commits
  2. 23 Mar, 2011 6 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · 4bbba111
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
        ALSA: HDA: Realtek: Avoid unnecessary volume control index on Surround/Side
        ASoC: Support !REGULATOR build for sgtl5000
        ALSA: hda - VIA: Fix VT1708 can't build up Headphone control issue
        ALSA: hda - VIA: Correct stream names for VT1818S
        ALSA: hda - VIA: Fix codec type for VT1708BCE at the right timing
        ALSA: hda - VIA: Fix invalid A-A path volume adjust issue
        ALSA: hda - VIA: Add missing support for VT1718S in A-A path
        ALSA: hda - VIA: Fix independent headphone no sound issue
        ALSA: hda - VIA: Fix stereo mixer recording no sound issue
        ALSA: hda - Set EAPD for Realtek ALC665
        ALSA: usb - Remove trailing spaces from USB card name strings
        sound: read i_size with i_size_read()
        ASoC: Remove bogus check for register validity in debugfs write
        ASoC: mini2440: Fix uda134x codec problem.
      4bbba111
    • Cesar Eduardo Barros's avatar
      sys_swapon: fix inode locking · 2130781e
      Cesar Eduardo Barros authored
      A conflict between 52c50567 ("mm: swap: unlock swapfile inode mutex
      before closing file on bad swapfiles") and 83ef99be ("sys_swapon:
      remove did_down variable") caused a double unlock of the inode mutex
      (once in bad_swap: before the filp_close, once at the end just before
      returning).
      
      The patch which added the extra unlock cleared did_down to avoid
      unlocking twice, but the other patch removed the did_down variable.
      
      To fix, set inode to NULL after the first unlock, since it will be used
      after that point only for the final unlock.
      
      While checking this patch, I found a path which could unlock without
      locking, in case the same inode was added as a swapfile twice. To fix,
      move the setting of the inode variable further down, to just before
      claim_swapfile, which will lock the inode before doing anything else.
      
      Cc: Mel Gorman <mgorman@suse.de>
      Cc: Hugh Dickins <hughd@google.com>
      Cc: Eric B Munson <emunson@mgebm.net>
      Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarCesar Eduardo Barros <cesarb@cesarb.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      2130781e
    • Heiko Carstens's avatar
      smp: add missing init.h include · 04948c7f
      Heiko Carstens authored
      Commit 34db18a0 ("smp: move smp setup functions to kernel/smp.c")
      causes this build error on s390 because of a missing init.h include:
      
        CC      arch/s390/kernel/asm-offsets.s
        In file included from /home2/heicarst/linux-2.6/arch/s390/include/asm/spinlock.h:14:0,
        from include/linux/spinlock.h:87,
        from include/linux/seqlock.h:29,
        from include/linux/time.h:8,
        from include/linux/timex.h:56,
        from include/linux/sched.h:57,
        from arch/s390/kernel/asm-offsets.c:10:
        include/linux/smp.h:117:20: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'setup_nr_cpu_ids'
        include/linux/smp.h:118:20: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'smp_init'
      
      Fix it by adding the include statement.
      Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
      Acked-by: default avatarWANG Cong <amwang@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      04948c7f
    • Takashi Iwai's avatar
      Merge branch 'topic/asoc' into for-linus · ce24f58a
      Takashi Iwai authored
      ce24f58a
    • David Henningsson's avatar
      ALSA: HDA: Realtek: Avoid unnecessary volume control index on Surround/Side · 5a882646
      David Henningsson authored
      Similar to commit 7e59e097, this patch
      avoids unnecessary volume control indices for more
      Realtek auto-parsers, e g the ALC66x family, on the "Surround" and "Side"
      controls.
      These indices cause these volume controls to be ignored by PulseAudio and
      vmaster and should be removed whenever possible.
      
      Cc: stable@kernel.org
      Reported-by: default avatarJan Losinski <losinski@wh2.tu-dresden.de>
      Signed-off-by: default avatarDavid Henningsson <david.henningsson@canonical.com>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      5a882646
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx · 6447f55d
      Linus Torvalds authored
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: (66 commits)
        avr32: at32ap700x: fix typo in DMA master configuration
        dmaengine/dmatest: Pass timeout via module params
        dma: let IMX_DMA depend on IMX_HAVE_DMA_V1 instead of an explicit list of SoCs
        fsldma: make halt behave nicely on all supported controllers
        fsldma: reduce locking during descriptor cleanup
        fsldma: support async_tx dependencies and automatic unmapping
        fsldma: fix controller lockups
        fsldma: minor codingstyle and consistency fixes
        fsldma: improve link descriptor debugging
        fsldma: use channel name in printk output
        fsldma: move related helper functions near each other
        dmatest: fix automatic buffer unmap type
        drivers, pch_dma: Fix warning when CONFIG_PM=n.
        dmaengine/dw_dmac fix: use readl & writel instead of __raw_readl & __raw_writel
        avr32: at32ap700x: Specify DMA Flow Controller, Src and Dst msize
        dw_dmac: Setting Default Burst length for transfers as 16.
        dw_dmac: Allow src/dst msize & flow controller to be configured at runtime
        dw_dmac: Changing type of src_master and dest_master to u8.
        dw_dmac: Pass Channel Priority from platform_data
        dw_dmac: Pass Channel Allocation Order from platform_data
        ...
      6447f55d