1. 12 Jun, 2009 4 commits
  2. 11 Jun, 2009 1 commit
  3. 10 Jun, 2009 3 commits
  4. 09 Jun, 2009 32 commits
    • Takashi Iwai's avatar
      Merge branch 'topic/usb-audio' into for-linus · 85e013a1
      Takashi Iwai authored
      * topic/usb-audio:
        ALSA: usb - Add boot quirk for C-Media 6206 USB Audio
        ALSA: usb-audio - errata corrige for quirk
        ALSA: usb-audio - Add quirk for Roland/Edirol M-16DX
        ALSA: usb-audio - quirk for USB Aureon cards
      85e013a1
    • Takashi Iwai's avatar
      Merge branch 'topic/seq-kconfig-cleanup' into for-linus · 4ef27920
      Takashi Iwai authored
      * topic/seq-kconfig-cleanup:
        ALSA: clean up the logic for building sequencer modules
      4ef27920
    • Takashi Iwai's avatar
      Merge branch 'topic/section-fix' into for-linus · 1282c824
      Takashi Iwai authored
      * topic/section-fix:
        ALSA: Add missing __devexit_p() markers
        ALSA: powermac - Replace the rest of __init*
        ALSA: sound/ppc: update annotations of serveral functions
      1282c824
    • Takashi Iwai's avatar
      Merge branch 'topic/sc6000' into for-linus · 45d60e36
      Takashi Iwai authored
      * topic/sc6000:
        ALSA: sc6000: enable joystick port
        ALSA: sc6000: fix older card initialization
        ALSA: sc6000: add support for SC-6600 and SC-7000
      45d60e36
    • Takashi Iwai's avatar
      Merge branch 'topic/riptide' into for-linus · 87cb14a5
      Takashi Iwai authored
      * topic/riptide:
        ALSA: riptide - Fix joystick resource handling
        ALSA: riptide - Code clean up
      87cb14a5
    • Takashi Iwai's avatar
      Merge branch 'topic/pcm-subclass-fix' into for-linus · 4ad75433
      Takashi Iwai authored
      * topic/pcm-subclass-fix:
        ALSA: Remove invalid GENERIC_MIX PCM sublass
      4ad75433
    • Takashi Iwai's avatar
      Merge branch 'topic/pcm-jiffies-check' into for-linus · 3b88bc52
      Takashi Iwai authored
      * topic/pcm-jiffies-check:
        ALSA: pcm - A helper function to compose PCM stream name for debug prints
        ALSA: pcm - Fix update of runtime->hw_ptr_interrupt
        ALSA: pcm - Fix a typo in hw_ptr update check
        ALSA: PCM midlevel: lower jiffies check margin using runtime->delay value
        ALSA: PCM midlevel: Do not update hw_ptr_jiffies when hw_ptr is not changed
        ALSA: PCM midlevel: introduce mask for xrun_debug() macro
        ALSA: PCM midlevel: improve fifo_size handling
      3b88bc52
    • Takashi Iwai's avatar
      Merge branch 'topic/pcm-delay' into for-linus · eabaf063
      Takashi Iwai authored
      * topic/pcm-delay:
        ALSA: usbaudio - Add delay account
        ALSA: Add extra delay count in PCM
      eabaf063
    • Takashi Iwai's avatar
      Merge branch 'topic/oxygen' into for-linus · 9dea75c7
      Takashi Iwai authored
      * topic/oxygen:
        sound: virtuoso: add Xonar Essence ST support
        sound: virtuoso: enable HDAV S/PDIF input
        sound: virtuoso: add another DX PCI ID
        sound: oxygen: reset DMA when stream is closed
      9dea75c7
    • Takashi Iwai's avatar
      Merge branch 'topic/misc' into for-linus · 8c3ff3a7
      Takashi Iwai authored
      * topic/misc:
        ALSA: sgio2audio.c: clean up checking
        ALSA: burgundy: timeout message is off by one.
        ALSA: bt87x - Add a quirk entry for Askey Computer Corp. MagicTView'99
        ALSA: parisc/harmony: fix printk format warning
        ALSA: keywest: Get rid of useless i2c_device_name() macro
      8c3ff3a7
    • Takashi Iwai's avatar
      Merge branch 'topic/maya44' into for-linus · ed8cc176
      Takashi Iwai authored
      * topic/maya44:
        ALSA: ice1724 - Add ESI Maya44 support
        ALSA: ice1724 - Allow spec driver to create own routing controls
        ALSA: ice1724 - Add PCI postint to reset sequence
        ALSA: ice1724 - Clean up definitions of DMA records
        ALSA: ice1724 - Check error in set_rate function
      ed8cc176
    • Takashi Iwai's avatar
      Merge branch 'topic/lx6464es' into for-linus · 03cece06
      Takashi Iwai authored
      * topic/lx6464es:
        ALSA: Add missing description of lx6464es to ALSA-Configuration.txt
        ALSA: lx6464es - Disable lx_message_send()
        ALSA: lx6464es - Use snd_card_create()
        ALSA: lx6464es - driver for the digigram lx6464es interface
      03cece06
    • Takashi Iwai's avatar
      Merge branch 'topic/hdsp' into for-linus · 3c2fcf36
      Takashi Iwai authored
      * topic/hdsp:
        ALSA: hdsp - Add a comment about external firmwares for hdsp
        ALSA: hdsp: allow firmware loading from inside the kernel
      3c2fcf36
    • Takashi Iwai's avatar
      Merge branch 'topic/hda' into for-linus · 81ad969d
      Takashi Iwai authored
      * topic/hda: (51 commits)
        ALSA: hda - Fix the previous tagra-8ch patch
        ALSA: hda - Add 7.1 support for MSI GX620
        ALSA: support Sony Vaio TT
        ALSA: hda_intel: fix build error when !PM
        ALSA: hda - More Aspire 8930G fixes
        ALSA: hda - Acer Aspire 8930G support
        ALSA: hda - Limit codec-verb retry to limited hardwares
        ALSA: hda - Add codec bus reset and verb-retry at critical errors
        ALSA: hda - Reorder and clean-up ALC268 quirk table
        ALSA: hda - fix audio on LG R510
        ALSA: hda - Macbook[Pro] 5 6ch support
        ALSA: hda-intel: improve initialization for ALC262_HP_BPC model
        ALSA: hda - Jack Mode changes for Sigmatel boards
        ALSA: hda - Support NVIDIA 8 channel HDMI audio
        ALSA: hda - Fix a typo in the previous patch
        ALSA: hda - Fix reverted LED setup for HP
        ALSA: hda - Add more register bits definitions
        ALSA: hda - Always sync writes in single_cmd mode
        ALSA: hda - Support sync after writing a verb
        ALSA: hda - Allow concurrent RIRB access in single_cmd mode
        ...
      81ad969d
    • Takashi Iwai's avatar
      Merge branch 'topic/emu10k1' into for-linus · 2f0dabcc
      Takashi Iwai authored
      * topic/emu10k1:
        ALSA: emu10k1 - Fix minimum periods for efx playback
      2f0dabcc
    • Takashi Iwai's avatar
      Merge branch 'topic/div64-cleanup' into for-linus · 19b1a15a
      Takashi Iwai authored
      * topic/div64-cleanup:
        ALSA: Clean up 64bit division functions
      19b1a15a
    • Takashi Iwai's avatar
      Merge branch 'topic/ctxfi' into for-linus · e618a560
      Takashi Iwai authored
      * topic/ctxfi: (35 commits)
        ALSA: ctxfi - Clear PCM resources at hw_params and hw_free
        ALSA: ctxfi - Check the presence of SRC instance in PCM pointer callbacks
        ALSA: ctxfi - Add missing start check in atc_pcm_playback_start()
        ALSA: ctxfi - Add use_system_timer module option
        ALSA: ctxfi - Fix wrong model id for UAA
        ALSA: ctxfi - Clean up probe routines
        ALSA: ctxfi - Fix / clean up hw20k2 chip code
        ALSA: ctxfi - Fix possible buffer pointer overrun
        ALSA: ctxfi - Remove useless initializations and cast
        ALSA: ctxfi - Fix DMA mask for emu20k2 chip
        ALSA: ctxfi - Make volume controls more intuitive
        ALSA: ctxfi - Optimize the native timer handling using wc counter
        ALSA: ctxfi - Add missing inclusion of linux/math64.h
        ALSA: ctxfi - Set device 0 for mixer control elements
        ALSA: ctxfi - Clean up / optimize
        ALSA: ctxfi - Set periods_min to 2
        ALSA: ctxfi - Use native timer interrupt on emu20k1
        ALSA: ctxfi - Fix previous fix for 64bit DMA
        ALSA: ctxfi - Fix endian-dependent codes
        ALSA: ctxfi - Allow 64bit DMA
        ...
      e618a560
    • Takashi Iwai's avatar
      Merge branch 'topic/core-id-check' into for-linus · d3e37436
      Takashi Iwai authored
      * topic/core-id-check:
        ALSA: Core - clean up snd_card_set_id* calls and remove possible id collision
        ALSA: Fix double locking of card list in snd_card_register()
      d3e37436
    • Takashi Iwai's avatar
      Merge branch 'topic/cleanup' into for-linus · d108728e
      Takashi Iwai authored
      * topic/cleanup:
        ALSA: Remove deprecated include/sound/driver.h
        ALSA: Remove deprecated snd_card_new()
      d108728e
    • Takashi Iwai's avatar
      Merge branch 'topic/caiaq' into for-linus · ab2f06cb
      Takashi Iwai authored
      * topic/caiaq:
        ALSA: snd_usb_caiaq: bump version number
        ALSA: snd_usb_caiaq: give better shortname
        ALSA: Core - add snd_card_set_id() function
        ALSA: snd_usb_caiaq: give better longname
        ALSA: snd_usb_caiaq: use strlcpy
        ALSA: snd_usb_caiaq: clean whitespaces
      ab2f06cb
    • Takashi Iwai's avatar
      Merge branch 'topic/ca0106' into for-linus · a963203c
      Takashi Iwai authored
      * topic/ca0106:
        ALSA: ca0106 - Fix master volume scale
        ALSA: ca0106 - Add missing card->mixername field setup
        ALSA: ca0106 - Add missing registrations of vmaster controls
      a963203c
    • Takashi Iwai's avatar
      Merge branch 'topic/au88x0' into for-linus · 1d479f89
      Takashi Iwai authored
      * topic/au88x0:
        ALSA: au88x0: fix wrong period_elapsed() call
        ALSA: au88x0: fix .pointer callback
      1d479f89
    • Takashi Iwai's avatar
      Merge branch 'topic/asoc' into for-linus · ba252af8
      Takashi Iwai authored
      * topic/asoc: (135 commits)
        ASoC: Apostrophe patrol
        ASoC: codec tlv320aic23 fix bogus divide by 0 message
        ASoC: fix NULL pointer dereference in soc_suspend()
        ASoC: Fix build error in twl4030.c
        ASoC: SSM2602: assign last substream to the master when shutting down
        ASoC: Blackfin: document how anomaly 05000250 is handled
        ASoC: Blackfin: set the transfer size according the ac97_frame size
        ASoC: SSM2602: remove unsupported sample rates
        ASoC: TWL4030: Check the interface format for 4 channel mode
        ASoC: TWL4030: Use reg_cache in twl4030_init_chip
        ASoC: Initialise dev for the dummy S/PDIF DAI
        ASoC: Add dummy S/PDIF codec support
        ASoC: correct print specifiers for unsigneds
        ASoC: Modify mpc5200 AC97 driver to use V9 of spin_event_timeout()
        ASoC: Switch FSL SSI DAI over to symmetric_rates
        ASoC: Mark MPC5200 AC97 as BROKEN until PowerPC merge issues are resolved
        ASoC: Fabric bindings for STAC9766 on the Efika
        ASoC: Support for AC97 on Phytec pmc030 base board.
        ASoC: AC97 driver for mpc5200
        ASoC: Main rewite of the mpc5200 audio DMA code
        ...
      ba252af8
    • Linus Torvalds's avatar
      Linux 2.6.30 · 07a2039b
      Linus Torvalds authored
      07a2039b
    • Peter Botha's avatar
      char: mxser, fix ISA board lookup · 96050dfb
      Peter Botha authored
      
      
      There's a bug in the mxser kernel module that still appears in the
      2.6.29.4 kernel.
      
      mxser_get_ISA_conf takes a ioaddress as its first argument, by passing the
      not of the ioaddr, you're effectively passing 0 which means it won't be
      able to talk to an ISA card.  I have tested this, and removing the !
      fixes the problem.
      
      Cc: "Peter Botha" <peterb@goldcircle.co.za>
      Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
      Acked-by: default avatarAlan Cox <alan@lxorguk.ukuu.org.uk>
      Cc: <stable@kernel.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      96050dfb
    • Jan Kara's avatar
      jbd: fix race in buffer processing in commit code · a61d90d7
      Jan Kara authored
      
      
      In commit code, we scan buffers attached to a transaction.  During this
      scan, we sometimes have to drop j_list_lock and then we recheck whether
      the journal buffer head didn't get freed by journal_try_to_free_buffers().
       But checking for buffer_jbd(bh) isn't enough because a new journal head
      could get attached to our buffer head.  So add a check whether the journal
      head remained the same and whether it's still at the same transaction and
      list.
      
      This is a nasty bug and can cause problems like memory corruption (use after
      free) or trigger various assertions in JBD code (observed).
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      Cc: <stable@kernel.org>
      Cc: <linux-ext4@vger.kernel.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      a61d90d7
    • Ian Kent's avatar
      autofs4: remove hashed check in validate_wait() · 463aea1a
      Ian Kent authored
      
      
      The recent ->lookup() deadlock correction required the directory inode
      mutex to be dropped while waiting for expire completion.  We were
      concerned about side effects from this change and one has been identified.
      
      I saw several error messages.
      
      They cause autofs to become quite confused and don't really point to the
      actual problem.
      
      Things like:
      
      handle_packet_missing_direct:1376: can't find map entry for (43,1827932)
      
      which is usually totally fatal (although in this case it wouldn't be
      except that I treat is as such because it normally is).
      
      do_mount_direct: direct trigger not valid or already mounted
      /test/nested/g3c/s1/ss1
      
      which is recoverable, however if this problem is at play it can cause
      autofs to become quite confused as to the dependencies in the mount tree
      because mount triggers end up mounted multiple times.  It's hard to
      accurately check for this over mounting case and automount shouldn't need
      to if the kernel module is doing its job.
      
      There was one other message, similar in consequence of this last one but I
      can't locate a log example just now.
      
      When checking if a mount has already completed prior to adding a new mount
      request to the wait queue we check if the dentry is hashed and, if so, if
      it is a mount point.  But, if a mount successfully completed while we
      slept on the wait queue mutex the dentry must exist for the mount to have
      completed so the test is not really needed.
      
      Mounts can also be done on top of a global root dentry, so for the above
      case, where a mount request completes and the wait queue entry has already
      been removed, the hashed test returning false can cause an incorrect
      callback to the daemon.  Also, d_mountpoint() is not sufficient to check
      if a mount has completed for the multi-mount case when we don't have a
      real mount at the base of the tree.
      Signed-off-by: default avatarIan Kent <raven@themaw.net>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      463aea1a
    • Mike Frysinger's avatar
      shm: fix unused warnings on nommu · 586c7e6a
      Mike Frysinger authored
      The massive nommu update (8feae131
      
      ) resulted in these warnings:
      ipc/shm.c: In function `sys_shmdt':
      ipc/shm.c:974: warning: unused variable `size'
      ipc/shm.c:972: warning: unused variable `next'
      Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
      Cc: David Howells <dhowells@redhat.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      586c7e6a
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus · 13df635f
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
        kvm: fix kvm reboot crash when MAXSMP is used
        cpumask: alloc zeroed cpumask for static cpumask_var_ts
        cpumask: introduce zalloc_cpumask_var
      13df635f
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block · 9cdba302
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.dk/linux-2.6-block:
        bsg: setting rq->bio to NULL
      9cdba302
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · fd4d3429
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
        cls_cgroup: Fix oops when user send improperly 'tc filter add' request
        r8169: fix crash when large packets are received
      fd4d3429
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://neil.brown.name/md · 4d11eff6
      Linus Torvalds authored
      * 'for-linus' of git://neil.brown.name/md:
        md/raid5: fix bug in reshape code when chunk_size decreases.
        md/raid5 - avoid deadlocks in get_active_stripe during reshape
        md/raid5: use conf->raid_disks in preference to mddev->raid_disk
      4d11eff6