1. 14 Sep, 2009 6 commits
  2. 11 Sep, 2009 1 commit
  3. 10 Sep, 2009 24 commits
    • Takashi Iwai's avatar
      Merge branch 'topic/ymfpci' into for-linus · 1110afbe
      Takashi Iwai authored
      * topic/ymfpci:
        sound: ymfpci: increase timer resolution to 96 kHz
      1110afbe
    • Takashi Iwai's avatar
      Merge branch 'topic/usb-audio' into for-linus · fd30afa4
      Takashi Iwai authored
      * topic/usb-audio:
        ALSA: usb-audio - Fix types taken in min()
        sound: usb-audio: do not make URBs longer than sync packet interval
        sound: usb-audio: add MIDI drain callback
        sound: usb-audio: use multiple output URBs
        sound: usb-audio: use multiple input URBs
        sound: usb-audio: Xonar U1 digital output support
      fd30afa4
    • Takashi Iwai's avatar
      Merge branch 'topic/tlv-minmax' into for-linus · b34c8663
      Takashi Iwai authored
      * topic/tlv-minmax:
        ALSA: usb-audio - Correct bogus volume dB information
        ALSA: usb-audio - Use the new TLV_DB_MINMAX type
        ALSA: Add new TLV types for dBwith min/max
      b34c8663
    • Takashi Iwai's avatar
      Merge branch 'topic/soundcore-preclaim' into for-linus · 3827119e
      Takashi Iwai authored
      * topic/soundcore-preclaim:
        sound: make OSS device number claiming optional and schedule its removal
        sound: request char-major-* module aliases for missing OSS devices
        chrdev: implement __[un]register_chrdev()
      3827119e
    • Takashi Iwai's avatar
      Merge branch 'topic/snd-printk' into for-linus · 9d416811
      Takashi Iwai authored
      * topic/snd-printk:
        ALSA: Fixed a typo of printk()
        ALSA: Add debug module option
        ALSA: core - strip too long file names in snd_print*()
      9d416811
    • Takashi Iwai's avatar
      Merge branch 'topic/pcm-estrpipe-in-pm' into for-linus · df9200dd
      Takashi Iwai authored
      * topic/pcm-estrpipe-in-pm:
        ALSA: pcm - Tell user that stream to be rewound is suspended
      df9200dd
    • Takashi Iwai's avatar
      Merge branch 'topic/pcm-drain-nonblock' into for-linus · 2c0d19a7
      Takashi Iwai authored
      * topic/pcm-drain-nonblock:
        ALSA: pcm - Increase protocol version
        ALSA: pcm - Fix drain behavior in non-blocking mode
      2c0d19a7
    • Takashi Iwai's avatar
      Merge branch 'topic/oxygen' into for-linus · 05a33e3d
      Takashi Iwai authored
      * topic/oxygen:
        sound: oxygen: work around MCE when changing volume
      05a33e3d
    • Takashi Iwai's avatar
      Merge branch 'topic/oss' into for-linus · fa285190
      Takashi Iwai authored
      * topic/oss:
        ALSA: allocation may fail in	snd_pcm_oss_change_params()
        sound: vwsnd: Fix setting of cfgval and ctlval in li_setup_dma()
        sound: fix OSS MIDI output data loss
      fa285190
    • Takashi Iwai's avatar
      Merge branch 'topic/misc' into for-linus · 9cd9f427
      Takashi Iwai authored
      * topic/misc:
        ALSA: Remove unneeded ifdef from sound/core.h
        ALSA: Remove struct snd_monitor_file from public sound/core.h
        ALSA: Release v1.0.21
      9cd9f427
    • Takashi Iwai's avatar
      Merge branch 'topic/midi' into for-linus · 0f23c5cc
      Takashi Iwai authored
      * topic/midi:
        sound: rawmidi: disable active-sensing-on-close by default
        sound: seq_oss_midi: remove magic numbers
        sound: seq_midi: do not send MIDI reset when closing
        seq-midi: always log message on output overrun
      0f23c5cc
    • Takashi Iwai's avatar
      Merge branch 'topic/ice1724-pm' into for-linus · 8a3351bb
      Takashi Iwai authored
      * topic/ice1724-pm:
        ALSA: ice1724 - Fix section mismatch
        ALSA: ice1724 - Patch for suspend/resume for Audiotrak Prodigy HD2
      8a3351bb
    • Takashi Iwai's avatar
      Merge branch 'topic/hdsp' into for-linus · dcb37d50
      Takashi Iwai authored
      * topic/hdsp:
        ALSA: hdsp - allow proc reporting with disconnected io box
      dcb37d50
    • Takashi Iwai's avatar
      Merge branch 'topic/hda' into for-linus · 2d4ff66a
      Takashi Iwai authored
      * topic/hda: (92 commits)
        ALSA: hda - Use auto model for HP laptops with ALC268 codec
        ALSA: hda/realtek: Added support for CLEVO M540R subsystem, 6 channel + digital
        ALSA: hda - Add support of Alienware M17x laptop
        ALSA: hda - Remove dead codes from patch_sigmatel.c
        ALSA: hda - Fix input source selection of IDT92HD73xx
        ALSA: hda - Fix obsolete CONFIG_SND_DEBUG_DETECT
        ALSA: hda - Unmute docking line-out as default with AD1984A codec
        ALSA: hda - Add another entry for Nvidia HDMI device
        ALSA: hda - Add missing GPIO initialization for AD1984A laptop model
        ALSA: hda - Add support of docking auto-mute/mic for AD1984A laptop model
        ALSA: hda - Fix ALC268/ALC269 headphone pin routing
        ALSA: hda - Create "Digital Mic Capture Volume" correctly for IDT codecs
        ALSA: hda - Add more quirk for HP laptops with AD1984A
        ALSA: hda - Add / fix model entries for HD-audio driver
        ALSA: hda - Add full audio support on Acer Aspire 7730G notebook
        ALSA: hda - Improve auto-cfg mixer name for ALC662
        ALSA: hda - Improve auto-cfg mixer name for ALC861-VD
        ALSA: hda - Improve auto-cfg mixer name for ALC262
        ALSA: hda - Improve auto-cfg mixer name for ALC260
        ALSA: hda - Improve auto-cfg mixer name for ALC880
        ...
      2d4ff66a
    • Takashi Iwai's avatar
      Merge branch 'topic/dummy' into for-linus · 6a0f4021
      Takashi Iwai authored
      * topic/dummy:
        ALSA: dummy - Increase MAX_PCM_SUBSTREAMS to 128
        ALSA: dummy - Add debug proc file
        ALSA: Add const prefix to proc helper functions
        ALSA: Re-export snd_pcm_format_name() function
        ALSA: dummy - Fake buffer allocations
        ALSA: dummy - Fix the timer calculation in systimer mode
        ALSA: dummy - Add more description
        ALSA: dummy - Better jiffies handling
        ALSA: dummy - Support high-res timer mode
      6a0f4021
    • Takashi Iwai's avatar
      Merge branch 'topic/dma-sgbuf' into for-linus · f9892a52
      Takashi Iwai authored
      * topic/dma-sgbuf:
        ALSA: Fix SG-buffer DMA with non-coherent architectures
      f9892a52
    • Takashi Iwai's avatar
      Merge branch 'topic/ctxfi' into for-linus · 6c5cb93b
      Takashi Iwai authored
      * topic/ctxfi:
        ALSA: ctxfi - Simple code clean up
        ALSA: ctxfi - Native timer support for emu20k2
      6c5cb93b
    • Takashi Iwai's avatar
      Merge branch 'topic/ctl-add-remove-fixes' into for-linus · f604529d
      Takashi Iwai authored
      * topic/ctl-add-remove-fixes:
        sound: snd_ctl_remove_user_ctl: prevent removal of kernel controls
        sound: snd_ctl_remove_unlocked_id: simplify user control counting
        sound: snd_ctl_remove_unlocked_id: simplify error paths
        sound: snd_ctl_elem_add: fix value count check
      f604529d
    • Takashi Iwai's avatar
      Merge branch 'topic/cs46xx' into for-linus · 124e39b3
      Takashi Iwai authored
      * topic/cs46xx:
        ALSA: cs46xx - Fix minimum period size
      124e39b3
    • Takashi Iwai's avatar
      Merge branch 'topic/cmi8330' into for-linus · 9d2743f8
      Takashi Iwai authored
      * topic/cmi8330:
        ALSA: cmi8330: Allow MPU-401-less operation
        ALSA: cmi8330: find OPL3 port automatically
        cmi8330: Add basic CMI8329 support
        ALSA: cmi8330: revert comments about AD1848 back
      9d2743f8
    • Takashi Iwai's avatar
      Merge branch 'topic/cleanup' into for-linus · d0064a1b
      Takashi Iwai authored
      * topic/cleanup:
        ALSA: info - Use krealloc()
      d0064a1b
    • Takashi Iwai's avatar
      Merge branch 'topic/azt3328' into for-linus · b81e5ab3
      Takashi Iwai authored
      * topic/azt3328:
        ALSA: azt3328: fix previous breakage, improve suspend, cleanups
        ALSA: azt3328: large codec cleanup, add I2S port etc.
        ALSA: azt3328: fix Kconfig entry
      b81e5ab3
    • Takashi Iwai's avatar
      Merge branch 'topic/asoc' into for-linus · e0b3032b
      Takashi Iwai authored
      * topic/asoc: (226 commits)
        ASoC: au1x: PSC-AC97 bugfixes
        ASoC: Fix WM835x Out4 capture enumeration
        ASoC: Remove unuused hw_read_t
        ASoC: fix pxa2xx-ac97.c breakage
        ASoC: Fully specify DC servo bits to update in wm_hubs
        ASoC: Debugged improper setting of PLL fields in WM8580 driver
        ASoC: new board driver to connect bfin-5xx with ad1836 codec
        ASoC: OMAP: Add functionality to set CLKR and FSR sources in McBSP DAI
        ASoC: davinci: i2c device creation moved into board files
        ASoC: Don't reconfigure WM8350 FLL if not needed
        ASoC: Fix s3c-i2s-v2 build
        ASoC: Make platform data optional for TLV320AIC3x
        ASoC: Add S3C24xx dependencies for Simtec machines
        ASoC: SDP3430: Fix TWL GPIO6 pin mux request
        ASoC: S3C platform: Fix s3c2410_dma_started() called at improper time
        ARM: OMAP: McBSP: Merge two functions into omap_mcbsp_start/_stop
        ASoC: OMAP: Fix setup of XCCR and RCCR registers in McBSP DAI
        OMAP: McBSP: Use textual values in DMA operating mode sysfs files
        ARM: OMAP: DMA: Add support for DMA channel self linking on OMAP1510
        ASoC: Select core DMA when building for S3C64xx
        ...
      e0b3032b
    • Takashi Iwai's avatar
      Merge branch 'topic/ali5451-cleanup' into for-linus · 45fae5c7
      Takashi Iwai authored
      * topic/ali5451-cleanup:
        ALSA: ali5451: remove dead code
      45fae5c7
  4. 09 Sep, 2009 3 commits
    • Linus Torvalds's avatar
      Linux 2.6.31 · 74fca6a4
      Linus Torvalds authored
      74fca6a4
    • Ed Cashin's avatar
      aoe: allocate unused request_queue for sysfs · 7135a71b
      Ed Cashin authored
      Andy Whitcroft reported an oops in aoe triggered by use of an
      incorrectly initialised request_queue object:
      
        [ 2645.959090] kobject '<NULL>' (ffff880059ca22c0): tried to add
      		an uninitialized object, something is seriously wrong.
        [ 2645.959104] Pid: 6, comm: events/0 Not tainted 2.6.31-5-generic #24-Ubuntu
        [ 2645.959107] Call Trace:
        [ 2645.959139] [<ffffffff8126ca2f>] kobject_add+0x5f/0x70
        [ 2645.959151] [<ffffffff8125b4ab>] blk_register_queue+0x8b/0xf0
        [ 2645.959155] [<ffffffff8126043f>] add_disk+0x8f/0x160
        [ 2645.959161] [<ffffffffa01673c4>] aoeblk_gdalloc+0x164/0x1c0 [aoe]
      
      The request queue of an aoe device is not used but can be allocated in
      code that does not sleep.
      
      Bruno bisected this regression down to
      
        cd43e26f
      
        block: Expose stacked device queues in sysfs
      
      "This seems to generate /sys/block/$device/queue and its contents for
       everyone who is using queues, not just for those queues that have a
       non-NULL queue->request_fn."
      
      Addresses http://bugs.launchpad.net/bugs/410198
      Addresses http://bugzilla.kernel.org/show_bug.cgi?id=13942
      
      Note that embedding a queue inside another object has always been
      an illegal construct, since the queues are reference counted and
      must persist until the last reference is dropped. So aoe was
      always buggy in this respect (Jens).
      Signed-off-by: default avatarEd Cashin <ecashin@coraid.com>
      Cc: Andy Whitcroft <apw@canonical.com>
      Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
      Cc: Bruno Premont <bonbons@linux-vserver.org>
      Cc: Martin K. Petersen <martin.petersen@oracle.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
      7135a71b
    • Linus Torvalds's avatar
      i915: disable interrupts before tearing down GEM state · e6890f6f
      Linus Torvalds authored
      Reinette Chatre reports a frozen system (with blinking keyboard LEDs)
      when switching from graphics mode to the text console, or when
      suspending (which does the same thing). With netconsole, the oops
      turned out to be
      
      	BUG: unable to handle kernel NULL pointer dereference at 0000000000000084
      	IP: [<ffffffffa03ecaab>] i915_driver_irq_handler+0x26b/0xd20 [i915]
      
      and it's due to the i915_gem.c code doing drm_irq_uninstall() after
      having done i915_gem_idle(). And the i915_gem_idle() path will do
      
        i915_gem_idle() ->
          i915_gem_cleanup_ringbuffer() ->
            i915_gem_cleanup_hws() ->
              dev_priv->hw_status_page = NULL;
      
      but if an i915 interrupt comes in after this stage, it may want to
      access that hw_status_page, and gets the above NULL pointer dereference.
      
      And since the NULL pointer dereference happens from within an interrupt,
      and with the screen still in graphics mode, the common end result is
      simply a silently hung machine.
      
      Fix it by simply uninstalling the irq handler before idling rather than
      after. Fixes
      
          http://bugzilla.kernel.org/show_bug.cgi?id=13819Reported-and-tested-by: default avatarReinette Chatre <reinette.chatre@intel.com>
      Acked-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      e6890f6f
  5. 08 Sep, 2009 6 commits