1. 10 Sep, 2009 4 commits
    • 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
  2. 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
  3. 08 Sep, 2009 2 commits
  4. 07 Sep, 2009 9 commits
  5. 06 Sep, 2009 1 commit
    • David S. Miller's avatar
      gianfar: Fix build. · d9d8e041
      David S. Miller authored
      Reported by Michael Guntsche <mike@it-loops.com>
      
      --------------------
      Commit
      38bddf04 gianfar: gfar_remove needs to call unregister_netdev()
      
      breaks the build of the gianfar driver because "dev" is undefined in
      this function. To quickly test rc9 I changed this to priv->ndev but I do
      not know if this is the correct one.
      --------------------
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      d9d8e041
  6. 05 Sep, 2009 21 commits