1. 09 Nov, 2009 2 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · d5d6eba9
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
        ALSA: snd-aica: declare MODULE_FIRMWARE
        ALSA: hda - Don't initialize CORB/RIRB for single_cmd mode
        ALSA: usb-audio: fix combine_word problem
        sound: Replace old style lock initializer
        ASoC: S3C64XX I2S: Enable audio-bus clock
        ASoC: OMAP: Don't try to set unsupported OMAP_DMA_DATA_BURST_16 on OMAP1
        ALSA: hda, move hp_bseries_system
        sound: Use KERN_WARNING instead of KERN_WARN, which does not exist
        ALSA: intel8x0: Mute External Amplifier by default for another Sony model
        ALSA: hda - Add OLPC XO-1.5 PCI ID
        ALSA: hda - Enable GPIO control for mute LED on HP systems
      d5d6eba9
    • Linus Torvalds's avatar
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 · f0ede3f3
      Linus Torvalds authored
      * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
        ACPI: sleep: another HP/Compaq DMI entries for init_set_sci_en_on_resume
        ACPI: add DMI entry for SCI_EN resume quirk on HP dv4
        thermal: sysfs-api.txt - document passive attribute for thermal zones
        thermal: sysfs-api.txt - reformat for improved readability
        acpi: thermal: Add EOL to the trip_point_N_type strings
        ACPI: Move dereference after NULL test
        ACPICA: avoid "Info: mapping multiple BARs. Your kernel is fine."
        ACPI: add __cpuinit to acpi_processor_add()
        acpi-power-meter: Don't leak ACPI error codes to userspace
        eeepc-laptop: don't enable camera at startup if it's already on.
        Revert "eeepc-laptop: Prevent a panic when disabling RT2860 wireless when associated"
        ACPI: clean up video.c boundary checks and types
      f0ede3f3
  2. 08 Nov, 2009 3 commits
  3. 07 Nov, 2009 3 commits
    • Takashi Iwai's avatar
      ALSA: hda - Don't initialize CORB/RIRB for single_cmd mode · 1a696978
      Takashi Iwai authored
      So far, CORB/RIRB still remains even if the driver is switched to the
      single_cmd mode.  The specification says that this should be disabled,
      but I hoped this isn't the case; indeed most devices worked together with
      CORB/RIRB.
      
      However, Poulsbo (US15W) seems problematic with this setup, and it
      requires to disable CORB/RIRB when single_cmd is used.
      
      Now this patch disables CORB/RIRB initialization when the single_cmd
      mode is used.  Also the unsolicited event is disabled because it can't
      work without RIRB.
      Reported-and-tested-by: default avatarTroy Kisky <troy.kisky@boundarydevices.com>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      1a696978
    • Julian Anastasov's avatar
      ALSA: usb-audio: fix combine_word problem · f4950882
      Julian Anastasov authored
      Fix combine_word problem where first octet is not
      read properly. The only affected place seems to be the
      INPUT_TERMINAL type. Before now, sound controls can be created
      with the output terminal's name which is a fallback mechanism
      used only for unknown input terminal types. For example,
      Line can wrongly appear as Speaker. After the change it
      should appear as Line.
      
      	The side effect of this change can be that users
      can expect the wrong control name in their scripts or
      programs while now we return the correct one.
      
      	Probably, these defines should use get_unaligned_le16 and
      friends.
      Signed-off-by: default avatarJulian Anastasov <ja@ssi.bg>
      Cc: <stable@kernel.org>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      f4950882
    • Thomas Gleixner's avatar
      sound: Replace old style lock initializer · 70edc800
      Thomas Gleixner authored
      SPIN_LOCK_UNLOCKED is deprecated. Use __SPIN_LOCK_UNLOCKED instead.
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      70edc800
  4. 06 Nov, 2009 5 commits
  5. 05 Nov, 2009 27 commits