1. 16 1月, 2009 24 次提交
  2. 15 1月, 2009 16 次提交
    • T
      Merge branch 'topic/virtuoso-fix' into for-linus · 320bc3b1
      Takashi Iwai 提交于
      320bc3b1
    • T
      Merge branch 'topic/usb-fix' into for-linus · 40f135f0
      Takashi Iwai 提交于
      40f135f0
    • T
      Merge branch 'topic/hda' into for-linus · e8d7bd34
      Takashi Iwai 提交于
      e8d7bd34
    • P
      ASoC: Fix the power update function for snd_soc_dapm_value_mux · eff317d0
      Peter Ujfalusi 提交于
      Modify the check for the mux type to also handle the
      snd_soc_dapm_value_mux type in a same way as the snd_soc_dapm_mux.
      Signed-off-by: NPeter Ujfalusi <peter.ujfalusi@nokia.com>
      Signed-off-by: NTakashi Iwai <tiwai@suse.de>
      eff317d0
    • C
      sound: virtuoso: do not overwrite EEPROM on Xonar D2/D2X · 7e86c0e6
      Clemens Ladisch 提交于
      On the Asus Xonar D2 and D2X models, the SPI chip select signal for the
      fourth DAC shares its pin with the serial clock for the EEPROM that
      contains the PCI subdevice ID values.  It appears that when DAC
      registers are written and some other unknown conditions occur (probably
      noise on the EEPROM's chip select line), the EEPROM gets overwritten
      with garbage, which makes it impossible to properly detect the card
      later.
      
      Therefore, we better avoid DAC register writes and make sure that the
      driver works with the DAC's registers' default values.  Consequently,
      the sample format is now I2S instead of left-justified (no user-visible
      change), and the DAC's volume/mute registers cannot be used anymore
      (volume changes are now done by the software volume plugin).
      Signed-off-by: NClemens Ladisch <clemens@ladisch.de>
      Cc: <stable@kernel.org>
      Signed-off-by: NTakashi Iwai <tiwai@suse.de>
      7e86c0e6
    • L
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 5393f780
      Linus Torvalds 提交于
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (29 commits)
        powerpc/83xx: Move mcu_mpc8349emitx driver out of drivers/i2c/chips/
        powerpc/83xx: Make serial ports work on MPC8315E-RDB w/ FSL U-Boots
        powerpc/e500mc: Doorbells need to be taken w/exceptions disabled
        powerpc: Enable PS3 options and QPACE in ppc64_defconfig
        powerpc/powermac: Fix occasional SMP boot failure
        powerpc/cacheinfo: Rename cache_dir per-cpu variable
        hvc_console: Use kzalloc() instead of kmalloc() + memset()
        hvc_console: Do not set low_latency when using interrupts
        hvc_console: Call free_irq() only if request_irq() was successful
        hvc_console: Change an mb() to smp_mb() and add some comments
        powerpc: Cleanup from l64 to ll64 change: drivers/net
        powerpc: Cleanup from l64 to ll64 change: drivers/char
        powerpc: Cleanup from l64 to ll64 change: arch code
        powerpc: Change u64/s64 to a long long integer type
        powerpc/kexec: Check crash_base for relocatable kernel
        powerpc: Make dummy section a valid note header
        Xilinx: SPI: updated driver for device tree
        drivers/of: Add the of_find_i2c_device_by_node function.
        powerpc/xsysace: add compatible string for non-ipcore instance
        powerpc/mpc52xx: remove dead code from GPIO driver
        ...
      5393f780
    • L
      Merge branch 'syscalls' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 · bca26856
      Linus Torvalds 提交于
      * 'syscalls' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: (44 commits)
        [CVE-2009-0029] s390 specific system call wrappers
        [CVE-2009-0029] System call wrappers part 33
        [CVE-2009-0029] System call wrappers part 32
        [CVE-2009-0029] System call wrappers part 31
        [CVE-2009-0029] System call wrappers part 30
        [CVE-2009-0029] System call wrappers part 29
        [CVE-2009-0029] System call wrappers part 28
        [CVE-2009-0029] System call wrappers part 27
        [CVE-2009-0029] System call wrappers part 26
        [CVE-2009-0029] System call wrappers part 25
        [CVE-2009-0029] System call wrappers part 24
        [CVE-2009-0029] System call wrappers part 23
        [CVE-2009-0029] System call wrappers part 22
        [CVE-2009-0029] System call wrappers part 21
        [CVE-2009-0029] System call wrappers part 20
        [CVE-2009-0029] System call wrappers part 19
        [CVE-2009-0029] System call wrappers part 18
        [CVE-2009-0029] System call wrappers part 17
        [CVE-2009-0029] System call wrappers part 16
        [CVE-2009-0029] System call wrappers part 15
        ...
      bca26856
    • H
      byteorder: make swab.h include asm/swab.h like a regular header · 74d96f01
      Harvey Harrison 提交于
      Add swab.h to kbuild.asm and remove the individual entries from
      each arch, mark as unifdef as some arches have some kernel-only
      bits inside.
      Signed-off-by: NHarvey Harrison <harvey.harrison@gmail.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      74d96f01
    • H
      cris: introduce asm/swab.h · aa0effbd
      Harvey Harrison 提交于
      Adjust the arch overrides to the new names as well.
      Signed-off-by: NHarvey Harrison <harvey.harrison@gmail.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      aa0effbd
    • L
      Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs · 5bf431fa
      Linus Torvalds 提交于
      * 'for-linus' of git://oss.sgi.com/xfs/xfs:
        [XFS] Update maintainers
        [XFS] use scalable vmap API
        [XFS] remove old vmap cache
        [XFS] make xfs_ino_t an unsigned long long
        [XFS] truncate readdir offsets to signed 32 bit values
        [XFS] fix compile of xfs_btree_readahead_lblock on m68k
        [XFS] Remove macro-to-function indirections in the mask code
        [XFS] Remove macro-to-function indirections in attr code
        [XFS] Remove several unused typedefs.
        [XFS] pass XFS_IGET_BULKSTAT to xfs_iget for handle operations
      5bf431fa
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 · c2919f2a
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
        IDE: fix sparse signed-ness errors with host->host_busy
        ide: fix suspend regression
        tx4938ide: Fix build error due to read_sff_dma_status moving
        ide: remove unused CONFIG_BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ
        sl82c105: remove dead code
        via82cxxx: fix cable warning message
        ide: can't use SSD/non-rotational queue flag for all CFA devices
        it821x.c: use dev->revision instead of pci_read_config_byte
        it821x: Add ultra_mask quirk for Vortex86SX
        ide: fix accidental LOCKDEP breakage caused by local_irq_set() removal
      c2919f2a
    • T
      ALSA: hda - Fix HP dv5 mic input · 1b0652eb
      Takashi Iwai 提交于
      Fix HP dv5 (103c:3603) built-in mic input.
      
      Reference: kernel bug 12440
      	http://bugzilla.kernel.org/show_bug.cgi?id=12440Signed-off-by: NTakashi Iwai <tiwai@suse.de>
      Cc: stable@kernel.org
      1b0652eb
    • B
      IDE: fix sparse signed-ness errors with host->host_busy · e720b9e4
      Ben Dooks 提交于
      The host_busy field in struct ide_host defaults to a
      signed-long, where most arch's test_and_set_bit_*
      macros use an unsigned long.
      
      Change to using an unsigned long, which on ARM removes
      the following sparse errors:
      
      drivers/ide/ide-io.c:681:8: warning: incorrect type in argument 2 (different signedness)
      drivers/ide/ide-io.c:681:8:    expected unsigned long volatile *p
      drivers/ide/ide-io.c:681:8:    got long volatile *<noident>
      drivers/ide/ide-io.c:681:8: warning: incorrect type in argument 2 (different signedness)
      drivers/ide/ide-io.c:681:8:    expected unsigned long volatile *p
      drivers/ide/ide-io.c:681:8:    got long volatile *<noident>
      drivers/ide/ide-io.c:695:3: warning: incorrect type in argument 2 (different signedness)
      drivers/ide/ide-io.c:695:3:    expected unsigned long volatile *p
      drivers/ide/ide-io.c:695:3:    got long volatile *<noident>
      drivers/ide/ide-io.c:695:3: warning: incorrect type in argument 2 (different signedness)
      drivers/ide/ide-io.c:695:3:    expected unsigned long volatile *p
      drivers/ide/ide-io.c:695:3:    got long volatile *<noident>
      drivers/ide/ide-io.c:695:3: warning: incorrect type in argument 2 (different signedness)
      drivers/ide/ide-io.c:695:3:    expected unsigned long volatile *p
      drivers/ide/ide-io.c:695:3:    got long volatile *<noident>
      drivers/ide/ide-io.c:695:3: warning: incorrect type in argument 2 (different signedness)
      drivers/ide/ide-io.c:695:3:    expected unsigned long volatile *p
      drivers/ide/ide-io.c:695:3:    got long volatile *<noident>
      drivers/ide/ide-io.c:695:3: warning: incorrect type in argument 2 (different signedness)
      drivers/ide/ide-io.c:695:3:    expected unsigned long volatile *p
      drivers/ide/ide-io.c:695:3:    got long volatile *<noident>
      drivers/ide/ide-io.c:695:3: warning: incorrect type in argument 2 (different signedness)
      drivers/ide/ide-io.c:695:3:    expected unsigned long volatile *p
      drivers/ide/ide-io.c:695:3:    got long volatile *<noident>
      drivers/ide/ide-io.c:695:3: warning: incorrect type in argument 2 (different signedness)
      drivers/ide/ide-io.c:695:3:    expected unsigned long volatile *p
      drivers/ide/ide-io.c:695:3:    got long volatile *<noident>
      drivers/ide/ide-io.c:695:3: warning: incorrect type in argument 2 (different signedness)
      drivers/ide/ide-io.c:695:3:    expected unsigned long volatile *p
      drivers/ide/ide-io.c:695:3:    got long volatile *<noident>
      Signed-off-by: NBen Dooks <ben-linux@fluff.org>
      Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      e720b9e4
    • B
      ide: fix suspend regression · 2ea55210
      Bartlomiej Zolnierkiewicz 提交于
      On Monday 12 January 2009, Simon Holm Thøgersen wrote:
      > commit 295f0004 ("ide: don't execute the next queued command from the
      > hard-IRQ context (v2)") breaks suspend to disk for me. On
      > 'echo disk > /sys/power/state' the systems hangs, letting me switch
      > virtual consoles, but not responding to Alt+SysRq
      
      Restart the request queue early for REQ_TYPE_PM_RESUME requests
      (though there is only one resume request for the whole resume
      sequence it stays in the queue until is fully completed and now
      depends on kblockd for processing consequential resume states).
      Reported-and-bisected-by: NSimon Holm Thøgersen <odie@cs.aau.dk>
      Tested-by: NSimon Holm Thøgersen <odie@cs.aau.dk>
      Signed-off-by: NBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      2ea55210
    • A
    • B