1. 20 Jun, 2012 27 commits
  2. 19 Jun, 2012 1 commit
  3. 18 Jun, 2012 12 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac · 02edf6ab
      Linus Torvalds authored
      Pull EDAC fixes from Mauro Carvalho Chehab.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac:
        edac: Do alignment logic properly in edac_align_ptr()
        mpc85xx_edac: fix error: too few arguments to function 'edac_mc_alloc'
        edac: fix the error about memory type detection on SandyBridge
        edac: avoid mce decoding crash after edac driver unloaded
      02edf6ab
    • Linus Torvalds's avatar
      Merge branch 'v9fs-devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs · 67f5d06d
      Linus Torvalds authored
      Pull a 9p bugfix from Eric Van Hensbergen.
      
      * 'v9fs-devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
        9p: BUG before corrupting memory
      67f5d06d
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 48d4e137
      Linus Torvalds authored
      Pull a crypto fix from Herbert Xu:
       "This push fixes another bug in the atmel-rng that made it produce
        completely useless output."
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
        hwrng: atmel-rng - fix data valid check
      48d4e137
    • Linus Torvalds's avatar
      Merge tag 'mmc-fixes-for-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc · 9023a409
      Linus Torvalds authored
      Pull MMC fixes from Chris Ball:
       - atmel-mci: Fixes for NULL timer and DMA burst/chunk size
       - dw_mmc: Fix DMA ordering, clkdiv calculation, NULL host->data
       - mxs_mmc: Compile fix for CONFIG_OF=y && CONFIG_PM=n
       - omap: Fix NULL deref in mmc_omap_remove_slot(), reg_shift initialization
       - sdhci-s3c: Fix boot regression by adding IRQF_ONESHOT flag
       - Small fixes to core/sd, core/sdio, sdhci
      
      * tag 'mmc-fixes-for-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:
        mmc: mxs-mmc: Move of_match_table out of CONFIG_PM
        mmc: sdhci-s3c: pass IRQF ONESHOT to request threaded irq
        mmc: core: return an error on suspend if mmc_deselect_cards fails
        mmc: omap: Fix broken reg_shift initialization
        mmc: omap: Fix NULL pointer dereference if mmc_omap_new_slot() fails
        mmc: omap: Fix a section warning regression
        mmc: dw_mmc: correct the calculation for CLKDIV
        mmc: dw_mmc: fix incorrect setting of host->data of NULL
        mmc: dw_mmc: fix the IDMAC sw reset
        mmc: dw_mmc: fix the transmission handling in IDMAC
        mmc: sdio: fix setting card data bus width as 4-bit
        mmc: atmel-mci: fix burst/chunk size modification
        mmc: atmel-mci: fix data timeout issue
        mmc: sdhci: Use DBG() instead of pr_warning() on large timeout
      9023a409
    • Linus Torvalds's avatar
      Merge tag 'rproc-fixes-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc · 1bea57f5
      Linus Torvalds authored
      Pull remoteproc fixes from Ohad Ben-Cohen:
       "A few relatively-small remoteproc fixes for 3.5: two error path fixes,
        and one -Wformat warning fix."
      
      * tag 'rproc-fixes-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc:
        remoteproc/omap: fix dev_err typo
        remoteproc: fix missing fault indication in error-path
        remoteproc: fix print format warnings
      1bea57f5
    • Linus Torvalds's avatar
      Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging · 4005af65
      Linus Torvalds authored
      Pull hwmon subsystem fixes from Jean Delvare.
      
      * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
        hwmon: (coretemp) Drop needless initialization
        hwmon: (coretemp) Document TjMax for 3rd generation i5/i7 processors
        hwmon: (coretemp) Improve support for TjMax detection on Atom CPUs
        hwmon: (coretemp) Add support for Atom D2000 and N2000 series CPU models
        hwmon: (coretemp) Improve support of recent Atom CPU models
      4005af65
    • Paul Mundt's avatar
      bug.h: Fix up powerpc build regression. · 2603efa3
      Paul Mundt authored
      The asm-generic/bug.h __ASSEMBLY__ guarding is completely bogus, which
      tripped up the powerpc build when the kernel.h include was added:
      
      	In file included from include/asm-generic/bug.h:5:0,
      			 from arch/powerpc/include/asm/bug.h:127,
      			 from arch/powerpc/kernel/head_64.S:31:
      	include/linux/kernel.h:44:0: warning: "ALIGN" redefined [enabled by default]
      	include/linux/linkage.h:57:0: note: this is the location of the previous definition
      	include/linux/sysinfo.h: Assembler messages:
      	include/linux/sysinfo.h:7: Error: Unrecognized opcode: `struct'
      	include/linux/sysinfo.h:8: Error: Unrecognized opcode: `__kernel_long_t'
      
      Moving the __ASSEMBLY__ guard up and stashing the kernel.h include under
      it fixes this up, as well as covering the case the original fix was
      attempting to handle.
      Tested-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
      Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      2603efa3
    • Paul Mundt's avatar
      Makefile: fix up CROSS_COMPILE and READABLE_ASM interaction. · a1f42beb
      Paul Mundt authored
      When the READABLE_ASM cc-option tests were added they were done so prior
      to the arch Makefile include, resulting in cc-option being run on the
      host cc instead of the factoring in the cross prefix set up by the
      architecture.
      
      This bumps the include back up so that cc-option actually runs on the
      compiler that we're building with.
      
      Cc: Andi Kleen <andi@firstfloor.org>
      Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      a1f42beb
    • Russell King's avatar
      SPI: fix over-eager devm_xxx() conversion · 10aa5a35
      Russell King authored
      1a77b127 (OMAP : SPI : use devm_* functions) converted the SPI
      device controller state to use devm_kzalloc().  Unfortunately, this
      is used against an unbound struct device, which results in the
      following when the device is bound to its driver:
      
      ------------[ cut here ]------------
      WARNING: at /home/rmk/git/linux-rmk/drivers/base/dd.c:257 driver_probe_device+0x78/0x21c()
      Modules linked in:
      Backtrace:
      [<c0017d0c>] (dump_backtrace+0x0/0x10c) from [<c033e208>] (dump_stack+0x18/0x1c) r7:00000000 r6:c01ff28c r5:c040050c r4:00000101
      [<c033e1f0>] (dump_stack+0x0/0x1c) from [<c00337ec>] (warn_slowpath_common+0x58/0x70)
      [<c0033794>] (warn_slowpath_common+0x0/0x70) from [<c0033828>] (warn_slowpath_null+0x24/0x2c)
      [<c0033804>] (warn_slowpath_null+0x0/0x2c) from [<c01ff28c>] (driver_probe_device+0x78/0x21c)
      [<c01ff214>] (driver_probe_device+0x0/0x21c) from [<c01ff49c>] (__driver_attach+0x6c/0x90)
      [<c01ff430>] (__driver_attach+0x0/0x90) from [<c01fda70>] (bus_for_each_dev+0x58/0x98)
      [<c01fda18>] (bus_for_each_dev+0x0/0x98) from [<c01ff0f4>] (driver_attach+0x20/0x28)
      [<c01ff0d4>] (driver_attach+0x0/0x28) from [<c01fe2f4>] (bus_add_driver+0xb4/0x230)
      [<c01fe240>] (bus_add_driver+0x0/0x230) from [<c01ffb24>] (driver_register+0xac/0x138)
      [<c01ffa78>] (driver_register+0x0/0x138) from [<c0215d4c>] (spi_register_driver+0x4c/0x60)
      [<c0215d00>] (spi_register_driver+0x0/0x60) from [<c045414c>] (ks8851_init+0x14/0x1c)
      [<c0454138>] (ks8851_init+0x0/0x1c) from [<c0008770>] (do_one_initcall+0x9c/0x164)
      [<c00086d4>] (do_one_initcall+0x0/0x164) from [<c0436410>] (kernel_init+0x128/0x210)
      [<c04362e8>] (kernel_init+0x0/0x210) from [<c0038754>] (do_exit+0x0/0x72c)
      ---[ end trace 4dcda79f5e89dd84 ]---
      ks8851 spi1.0: message enable is 0
      ks8851 spi1.0: eth0: revision 0, MAC 08:00:28:01:4d:c6, IRQ 194, has EEPROM
      
      Fix this by partially reverting the original commit.
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      10aa5a35
    • Daniel Mack's avatar
      ALSA: 6fire: use NULL instead of 0 for pointer assignment · 0b1d8e09
      Daniel Mack authored
      Signed-off-by: default avatarDaniel Mack <zonque@gmail.com>
      Cc: Torsten Schenk <torsten.schenk@zoho.com>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      0b1d8e09
    • Dylan Reid's avatar
      ALSA: hda - Handle open while transitioning to D3. · b4a91cf0
      Dylan Reid authored
      This addresses an issue encountered when a pcm is opened while
      transitioning to low power state (codec->power_on == 1 &&
      codec->power_transition == -1).  Add snd_pcm_power_up_d3wait to
      hda_codec.  This function is used to power up from azx_open as opposed
      to snd_hda_power_up used from codec_exec_verb. When powering up from
      azx_open, wait for pending power downs to complete, avoiding the power
      up continuing in parallel with the power down on the work queue.
      
      The specific issue seen was with the CS4210 codec, it powers off the ADC
      and DAC nid in its suspend handler.  If it is re-opened before the
      ~100ms power down process completes, the ADC and DAC nid are initialized
      while powered down and audio is lost until another suspend/resume cycle.
      Signed-off-by: default avatarDylan Reid <dgreid@chromium.org>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      b4a91cf0
    • Daniel Mack's avatar
      afe25967