Skip to content
Commits on Apr 14, 2012
  1. Merge branch 'distro-3.3' into pf-3.3

    Oleksandr Natalenko committed Apr 15, 2012
  2. distro-3.3: bump version to 3.3.2

    Oleksandr Natalenko committed Apr 15, 2012
  3. fix merge conflict

    Oleksandr Natalenko committed Apr 15, 2012
  4. version-3.3: bump to v3.3.2-pf

    Oleksandr Natalenko committed Apr 15, 2012
  5. fix merge conflict

    Oleksandr Natalenko committed Apr 14, 2012
Commits on Apr 13, 2012
  1. @gregkh

    Linux 3.3.2

    gregkh committed Apr 13, 2012
  2. @gregkh

    Revert "ath9k: fix going to full-sleep on PS idle"

    Sujith Manoharan committed with gregkh Apr 10, 2012
    commit 011afa1 upstream.
    
    This reverts commit c1afdaf.
    
    Users have reported connection failures in 3.3.1 and suspend/resume
    failures in 3.4-rcX. Revert this commit for now - PS IDLE can be
    fixed in a clean manner later on.
    
    Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  3. @utrace @gregkh

    cred: copy_process() should clear child->replacement_session_keyring

    utrace committed with gregkh Apr 9, 2012
    commit 79549c6 upstream.
    
    keyctl_session_to_parent(task) sets ->replacement_session_keyring,
    it should be processed and cleared by key_replace_session_keyring().
    
    However, this task can fork before it notices TIF_NOTIFY_RESUME and
    the new child gets the bogus ->replacement_session_keyring copied by
    dup_task_struct(). This is obviously wrong and, if nothing else, this
    leads to put_cred(already_freed_cred).
    
    change copy_creds() to clear this member. If copy_process() fails
    before this point the wrong ->replacement_session_keyring doesn't
    matter, exit_creds() won't be called.
    
    Signed-off-by: Oleg Nesterov <oleg@redhat.com>
    Acked-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  4. @lp0 @gregkh

    media: dvb-core: fix DVBFE_ALGO_HW retune bug

    lp0 committed with gregkh Feb 6, 2012
    commit 45145b6 upstream.
    
    Commit 7e07222 breaks DVBFE_ALGO_HW tuning after a retune is requested,
    which causes bad tuning on my TBS 6920.
    
    [    0.769091] pci 0000:06:00.0: [14f1:8852] type 0 class 0x000400
    [   19.733530] CORE cx23885[0]: subsystem: 6920:8888, board: TurboSight TBS 6920 [card=14,autodetected]
    [  762.824912] cx24116_load_firmware: FW version 1.23.86.1
    
    7e07222 [media] dvb-core: Don't pass DVBv3 parameters on tune() fops
    
    Although re_tune is set to true when FESTATE_RETUNE occurs, it is never
    set back to false which the old code used to do when !FESTATE_RETUNE.
    
    This patch sets re_tune to false if !(state & FESTATE_RETUNE).
    
    $ szap-s2 -a 2 "Channel 5"
    reading channels from file '/home/simon/.szap/channels.conf'
    zapping to 247 'Channel 5':
    delivery DVB-S, modulation QPSK
    sat 0, frequency 10964 MHz H, symbolrate 22000000, coderate 5/6, rolloff 0.35
    vpid 0x092a, apid 0x092b, sid 0x092d
    using '/dev/dvb/adapter2/frontend0' and '/dev/dvb/adapter2/demux0'
    status 1f | signal cf40 | snr 0000 | ber 00000000 | unc 00000000 | FE_HAS_LOCK
    status 1f | signal cf40 | snr eccd | ber 00000000 | unc 00000000 | FE_HAS_LOCK
    status 1f | signal cf40 | snr 0000 | ber 00000000 | unc 00000000 | FE_HAS_LOCK
    status 1f | signal cf40 | snr 0000 | ber 00000000 | unc 00000000 | FE_HAS_LOCK
    status 1f | signal cf40 | snr eccd | ber 00000000 | unc 00000000 | FE_HAS_LOCK
    status 1f | signal cf40 | snr 0000 | ber 00000000 | unc 00000000 | FE_HAS_LOCK
    status 1f | signal cf40 | snr 0000 | ber 00000000 | unc 00000000 | FE_HAS_LOCK
    status 1f | signal cf40 | snr eb33 | ber 00000000 | unc 00000000 | FE_HAS_LOCK
    status 1f | signal cf40 | snr eccd | ber 00000000 | unc 00000000 | FE_HAS_LOCK
    status 1f | signal cf40 | snr eccd | ber 00000000 | unc 00000000 | FE_HAS_LOCK
    status 1f | signal cf40 | snr 0000 | ber 00000000 | unc 00000000 | FE_HAS_LOCK
    status 1f | signal cf40 | snr eccd | ber 00000000 | unc 00000000 | FE_HAS_LOCK
    status 1f | signal cf40 | snr eccd | ber 00000000 | unc 00000000 | FE_HAS_LOCK
    status 1f | signal cf40 | snr 0000 | ber 00000000 | unc 00000000 | FE_HAS_LOCK
    status 1f | signal cec0 | snr eccd | ber 00000000 | unc 00000000 | FE_HAS_LOCK
    status 1f | signal cec0 | snr 0000 | ber 00000000 | unc 00000000 | FE_HAS_LOCK
    
    Signed-off-by: Simon Arlott <simon@fire.lp0.eu>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  5. @gregkh

    media: dvb_frontend: regression fix: userspace ABI broken for xine

    Chris Rankin committed with gregkh Apr 6, 2012
    commit 556a044 upstream.
    
    The commit e399ce7 has broken the DVB ABI for xine:
    
    The problem is that xine is expecting every event after a successful
    FE_SET_FRONTEND ioctl to have a non-zero frequency parameter, regardless
    of whether the tuning process has LOCKed yet. What used to happen is
    that the events inherited the initial tuning parameters from the
    FE_SET_FRONTEND call. However, the fepriv->parameters_out struct is now
    not initialised until the status contains the FE_HAS_LOCK bit.
    
    You might argue that this behaviour is intentional, except that if an
    application other than xine uses the DVB adapter and manages to set the
    parameters_out.frequency field to something other than zero, then xine
    no longer has any problems until either the adapter is replugged or the
    kernel modules reloaded. This can only mean that the
    fepriv->parameters_out struct still contains the (stale) tuning
    information from the previous application.
    
    Signed-off-by: Chris Rankin <rankincj@yahoo.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  6. @swarren @gregkh

    ASoC: tegra: fix i2s compilation when !CONFIG_DEBUG_FS

    swarren committed with gregkh Apr 5, 2012
    commit 8abe05c upstream.
    
    Commit d4a2eca "ASoC: Tegra I2S: Remove dependency on pdev->id" changed
    the prototype of tegra_i2s_debug_add, but didn't update the dummy inline
    used when !CONFIG_DEBUG_FS. Fix that.
    
    Signed-off-by: Stephen Warren <swarren@nvidia.com>
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  7. @morimoto @gregkh

    ASoC: ak4642: fixup: mute needs +1 step

    morimoto committed with gregkh Apr 4, 2012
    commit 1f99e44 upstream.
    
    ak4642 out_tlv is +12.0dB to -115.0 dB, and it supports mute.
    But current settings didn't care +1 step for mute.
    This patch adds it
    
    Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  8. @pinchartl @gregkh

    uvcvideo: Fix race-related crash in uvc_video_clock_update()

    pinchartl committed with gregkh Mar 27, 2012
    commit ed0ee0c upstream.
    
    The driver frees the clock samples buffer before stopping the video
    buffers queue. If a DQBUF call arrives in-between,
    uvc_video_clock_update() will be called with a NULL clock samples
    buffer, leading to a crash. This occurs very frequently when using the
    webcam with the flash browser plugin.
    
    Move clock initialization/cleanup to uvc_video_enable() in order to free
    the clock samples buffer after the queue is stopped. Make sure the clock
    is reset at resume time to avoid miscalculating timestamps.
    
    Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  9. @djbw @gregkh

    ioat: fix size of 'completion' for Xen

    djbw committed with gregkh Mar 23, 2012
    commit 2750293 upstream.
    
    Starting with v3.2 Jonathan reports that Xen crashes loading the ioatdma
    driver.  A debug run shows:
    
      ioatdma 0000:00:16.4: desc[0]: (0x300cc7000->0x300cc7040) cookie: 0 flags: 0x2 ctl: 0x29 (op: 0 int_en: 1 compl: 1)
      ...
      ioatdma 0000:00:16.4: ioat_get_current_completion: phys_complete: 0xcc7000
    
    ...which shows that in this environment GFP_KERNEL memory may be backed
    by a 64-bit dma address.  This breaks the driver's assumption that an
    unsigned long should be able to contain the physical address for
    descriptor memory.  Switch to dma_addr_t which beyond being the right
    size, is the true type for the data i.e. an io-virtual address
    inidicating the engine's last processed descriptor.
    
    Reported-by: Jonathan Nieder <jrnieder@gmail.com>
    Reported-by: William Dauchy <wdauchy@gmail.com>
    Tested-by: William Dauchy <wdauchy@gmail.com>
    Tested-by: Dave Jiang <dave.jiang@intel.com>
    Signed-off-by: Dan Williams <dan.j.williams@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  10. @gregkh

    USB: Add Motorola Rokr E6 Id to the USBNet driver "zaurus"

    Guan Xin committed with gregkh Mar 26, 2012
    commit a2daf26 upstream.
    
    Added Vendor/Device Id of Motorola Rokr E6 (22b8:6027) so it can be
    recognized by the "zaurus" USBNet driver.
    Applies to Linux 3.2.13 and 2.6.39.4.
    Signed-off-by: Guan Xin <guanx.bac@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  11. @nmenon @gregkh

    mfd: Clear twl6030 IRQ status register only once

    nmenon committed with gregkh Feb 22, 2012
    commit 3f8349e upstream.
    
    TWL6030 family of PMIC use a shadow interrupt status register
    while kernel processes the current interrupt event.
    However, any write(0 or 1) to register INT_STS_A, INT_STS_B or
    INT_STS_C clears all 3 interrupt status registers.
    
    Since clear of the interrupt is done on 32k clk, depending on I2C
    bus speed, we could in-adverently clear the status of a interrupt
    status pending on shadow register in the current implementation.
    This is due to the fact that multi-byte i2c write operation into
    three seperate status register could result in multiple load
    and clear of status and result in lost interrupts.
    
    Instead, doing a single byte write to INT_STS_A register with 0x0
    will clear all three interrupt status registers without the related
    risk.
    
    Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
    Signed-off-by: Nishanth Menon <nm@ti.com>
    Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  12. @sqazi @gregkh

    sched/x86: Fix overflow in cyc2ns_offset

    sqazi committed with gregkh Mar 9, 2012
    commit 9993bc6 upstream.
    
    When a machine boots up, the TSC generally gets reset.  However,
    when kexec is used to boot into a kernel, the TSC value would be
    carried over from the previous kernel.  The computation of
    cycns_offset in set_cyc2ns_scale is prone to an overflow, if the
    machine has been up more than 208 days prior to the kexec.  The
    overflow happens when we multiply *scale, even though there is
    enough room to store the final answer.
    
    We fix this issue by decomposing tsc_now into the quotient and
    remainder of division by CYC2NS_SCALE_FACTOR and then performing
    the multiplication separately on the two components.
    
    Refactor code to share the calculation with the previous
    fix in __cycles_2_ns().
    
    Signed-off-by: Salman Qazi <sqazi@google.com>
    Acked-by: John Stultz <john.stultz@linaro.org>
    Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Paul Turner <pjt@google.com>
    Cc: john stultz <johnstul@us.ibm.com>
    Link: http://lkml.kernel.org/r/20120310004027.19291.88460.stgit@dungbeetle.mtv.corp.google.com
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Cc: Mike Galbraith <efault@gmx.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  13. @gregkh

    Fix length of buffer copied in __nfs4_get_acl_uncached

    Sachin Prabhu committed with gregkh Mar 22, 2012
    commit 20e0fa9 upstream.
    
    _copy_from_pages() used to copy data from the temporary buffer to the
    user passed buffer is passed the wrong size parameter when copying
    data. res.acl_len contains both the bitmap and acl lenghts while
    acl_len contains the acl length after adjusting for the bitmap size.
    
    Signed-off-by: Sachin Prabhu <sprabhu@redhat.com>
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
    Cc: Josh Boyer <jwboyer@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  14. @gregkh

    acer-wmi: No wifi rfkill on Sony machines

    Lee, Chun-Yi committed with gregkh Mar 23, 2012
    commit 5719b81 upstream.
    
    The wireless rfkill should charged by sony-laptop but not acer-wmi.
    So, add Sony's SNY5001 acpi device to blacklist in acer-wmi.
    
    Tested on Sony Vaio
    
    Cc: Carlos Corbacho <carlos@strangeworlds.co.uk>
    Cc: Matthew Garrett <mjg@redhat.com>
    Cc: Mattia Dongili <malattia@linux.it>
    Cc: Dimitris N <ddarlac@gmail.com>
    Tested-by: Dimitris N <ddarlac@gmail.com>
    Signed-off-by: Lee, Chun-Yi <jlee@suse.com>
    Signed-off-by: Matthew Garrett <mjg@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  15. @gregkh

    Revert "x86/ioapic: Add register level checks to detect bogus io-apic…

    gregkh committed Apr 10, 2012
    … entries"
    
    This reverts commit a998dc2
    [73d63d0 upstream]
    
    It causes problems, so needs to be reverted from 3.2-stable for now.
    
    Reported-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
    Cc: Jon Dufresne <jon@jondufresne.org>
    Cc: Suresh Siddha <suresh.b.siddha@intel.com>
    Cc: <yinghai@kernel.org>
    Cc: Josh Boyer <jwboyer@redhat.com>
    Cc: Ingo Molnar <mingo@elte.hu>
    Cc: Teck Choon Giam <giamteckchoon@gmail.com>
    Cc: Ben Guthro <ben@guthro.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  16. @sgruszka @gregkh

    iwlegacy: do not nulify il->vif on reset

    sgruszka committed with gregkh Mar 13, 2012
    commit 883a649 upstream.
    
    This il->vif is dereferenced in different part of iwlegacy code, so do
    not nullify it. This should fix random crashes observed in companion
    with microcode errors i.e. crash in il3945_config_ap().
    
    Additionally this should address also
    WARNING: at drivers/net/wireless/iwlegacy/common.c:4656 il_mac_remove_interface
    at least one of the possible reasons of that warning.
    
    Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  17. @gregkh

    TOMOYO: Fix mount flags checking order.

    Tetsuo Handa committed with gregkh Feb 29, 2012
    commit df91e49 upstream.
    
    Userspace can pass in arbitrary combinations of MS_* flags to mount().
    
    If both MS_BIND and one of MS_SHARED/MS_PRIVATE/MS_SLAVE/MS_UNBINDABLE are
    passed, device name which should be checked for MS_BIND was not checked because
    MS_SHARED/MS_PRIVATE/MS_SLAVE/MS_UNBINDABLE had higher priority than MS_BIND.
    
    If both one of MS_BIND/MS_MOVE and MS_REMOUNT are passed, device name which
    should not be checked for MS_REMOUNT was checked because MS_BIND/MS_MOVE had
    higher priority than MS_REMOUNT.
    
    Fix these bugs by changing priority to MS_REMOUNT -> MS_BIND ->
    MS_SHARED/MS_PRIVATE/MS_SLAVE/MS_UNBINDABLE -> MS_MOVE as with do_mount() does.
    
    Also, unconditionally return -EINVAL if more than one of
    MS_SHARED/MS_PRIVATE/MS_SLAVE/MS_UNBINDABLE is passed so that TOMOYO will not
    generate inaccurate audit logs, for commit 7a2e8a8 "VFS: Sanity check mount
    flags passed to change_mnt_propagation()" clarified that these flags must be
    exclusively passed.
    
    Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
    Signed-off-by: James Morris <james.l.morris@oracle.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  18. @gregkh

    android, lowmemorykiller: remove task handoff notifier

    David Rientjes committed with gregkh Apr 9, 2012
    commit 83dbbdb upstream.
    
    The task handoff notifier leaks task_struct since it never gets freed
    after the callback returns NOTIFY_OK, which means it is responsible for
    doing so.
    
    It turns out the lowmemorykiller actually doesn't need this notifier at
    all.  It's used to prevent unnecessary killing by waiting for a thread
    to exit as a result of lowmem_shrink(), however, it's possible to do
    this in the same way the kernel oom killer works by setting TIF_MEMDIE
    and avoid killing if we're still waiting for it to exit.
    
    The kernel oom killer will already automatically set TIF_MEMDIE for
    threads that are attempting to allocate memory that have a fatal signal.
    The thread selected by lowmem_shrink() will have such a signal after the
    lowmemorykiller sends it a SIGKILL, so this won't result in an
    unnecessary use of memory reserves for the thread to exit.
    
    This has the added benefit that we don't have to rely on
    CONFIG_PROFILING to prevent needlessly killing tasks.
    
    Reported-by: Werner Landgraf <w.landgraf@ru.ru>
    Signed-off-by: David Rientjes <rientjes@google.com>
    Acked-by: Colin Cross <ccross@android.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  19. @AxelLin @gregkh

    mfd: Fix section mismatch warning for da9052-spi

    AxelLin committed with gregkh Jan 11, 2012
    commit e536b62 upstream.
    
    Add __devinit annotation for da9052_spi_probe to fix below build warning:
    
    WARNING: drivers/built-in.o(.text+0x349b4): Section mismatch in reference from the function da9052_spi_probe() to the function .devinit.text:da9052_device_init()
    The function da9052_spi_probe() references
    the function __devinit da9052_device_init().
    This is often because da9052_spi_probe lacks a __devinit
    annotation or the annotation of da9052_device_init is wrong.
    
    Also add __devexit annotation for da9052_spi_remove because we have
    __devexit_p around it in the remove callback.
    
    Signed-off-by: Axel Lin <axel.lin@gmail.com>
    Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  20. @gregkh

    modpost: Fix modpost license checking of vmlinux.o

    Frank Rowand committed with gregkh Apr 9, 2012
    commit 258f742 upstream.
    
    Commit f02e8a6 ("module: Sort exported symbols") sorts symbols
    placing each of them in its own elf section.  This sorting and merging
    into the canonical sections are done by the linker.
    
    Unfortunately modpost to generate Module.symvers file parses vmlinux.o
    (which is not linked yet) and all modules object files (which aren't
    linked yet).  These aren't sanitized by the linker yet.  That breaks
    modpost that can't detect license properly for modules.
    
    This patch makes modpost aware of the new exported symbols structure.
    
    [ This above is a slightly corrected version of the explanation of the
      problem, copied from commit 62a2635 ("modpost: Fix modpost's
      license checking V3").  That commit fixed the problem for module
      object files, but not for vmlinux.o.  This patch fixes modpost for
      vmlinux.o. ]
    
    Signed-off-by: Frank Rowand <frank.rowand@am.sony.com>
    Signed-off-by: Alessio Igor Bogani <abogani@kernel.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  21. @swarren @gregkh

    regmap: prevent division by zero in rbtree_show

    swarren committed with gregkh Apr 4, 2012
    commit c04c1b9 upstream.
    
    If there are no nodes in the cache, nodes will be 0, so calculating
    "registers / nodes" will cause division by zero.
    
    Signed-off-by: Stephen Warren <swarren@nvidia.com>
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  22. @kees @gregkh

    sysctl: fix write access to dmesg_restrict/kptr_restrict

    kees committed with gregkh Apr 4, 2012
    commit 620f6e8 upstream.
    
    Commit bfdc0b4 adds code to restrict access to dmesg_restrict,
    however, it incorrectly alters kptr_restrict rather than
    dmesg_restrict.
    
    The original patch from Richard Weinberger
    (https://lkml.org/lkml/2011/3/14/362) alters dmesg_restrict as
    expected, and so the patch seems to have been misapplied.
    
    This adds the CAP_SYS_ADMIN check to both dmesg_restrict and
    kptr_restrict, since both are sensitive.
    
    Reported-by: Phillip Lougher <plougher@redhat.com>
    Signed-off-by: Kees Cook <keescook@chromium.org>
    Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
    Acked-by: Richard Weinberger <richard@nod.at>
    Signed-off-by: James Morris <james.l.morris@oracle.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  23. @gregkh

    tcm_fc: Do not free tpg structure during wq allocation failure

    Mark Rustad committed with gregkh Apr 3, 2012
    commit 06383f1 upstream.
    
    Avoid freeing a registered tpg structure if an alloc_workqueue call
    fails.  This fixes a bug where the failure was leaking memory associated
    with se_portal_group setup during the original core_tpg_register() call.
    
    Signed-off-by: Mark Rustad <mark.d.rustad@intel.com>
    Acked-by: Kiran Patil <Kiran.patil@intel.com>
    Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  24. @gregkh

    tcm_fc: Add abort flag for gracefully handling exchange timeout

    Mark Rustad committed with gregkh Apr 3, 2012
    commit e1c4038 upstream.
    
    Add abort flag and use it to terminate processing when an exchange
    is timed out or is reset. The abort flag is used in place of the
    transport_generic_free_cmd function call in the reset and timeout
    cases, because calling that function in that context would free
    memory that was in use. The aborted flag allows the lifetime to
    be managed in a more normal way, while truncating the processing.
    
    This change eliminates a source of memory corruption which
    manifested in a variety of ugly ways.
    
    (nab: Drop unused struct fc_exch *ep in ft_recv_seq)
    
    Signed-off-by: Mark Rustad <mark.d.rustad@intel.com>
    Acked-by: Kiran Patil <Kiran.patil@intel.com>
    Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  25. @ldesroches @gregkh

    mmc: atmel-mci: correct data timeout computation

    ldesroches committed with gregkh Mar 28, 2012
    commit 66292ad upstream.
    
    The HSMCI operates at a rate of up to Master Clock divided by two.
    Moreover previous calculation can cause overflows and so wrong
    timeouts.
    
    Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
    Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
    Signed-off-by: Chris Ball <cjb@laptop.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  26. @alfh @gregkh

    mmc: sdhci-dove: Fix compile error by including module.h

    alfh committed with gregkh Apr 4, 2012
    commit 8c2fc8e upstream.
    
    This patch fixes a compile error in drivers/mmc/host/sdhci-dove.c
    by including the linux/module.h file.
    
    Signed-off-by: Alf Høgemark <alf@i100.no>
    Signed-off-by: Chris Ball <cjb@laptop.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  27. @rjwysocki @gregkh

    mmc: sdio: Use empty system suspend/resume callbacks at the bus level

    rjwysocki committed with gregkh Apr 1, 2012
    commit e841a7c upstream.
    
    Neil Brown reports that commit 35cd133c
    
       PM: Run the driver callback directly if the subsystem one is not there
    
    breaks suspend for his libertas wifi, because SDIO has a protocol
    where the suspend method can return -ENOSYS and this means "There is
    no point in suspending, just turn me off".  Moreover, the suspend
    methods provided by SDIO drivers are not supposed to be called by
    the PM core or bus-level suspend routines (which aren't presend for
    SDIO).  Instead, when the SDIO core gets to suspend the device's
    ancestor, it calls the device driver's suspend function, catches the
    ENOSYS, and turns the device off.
    
    The commit above breaks the SDIO core's assumption that the device
    drivers' callbacks won't be executed if it doesn't provide any
    bus-level callbacks.  If fact, however, this assumption has never
    been really satisfied, because device class or device type suspend
    might very well use the driver's callback even without that commit.
    
    The simplest way to address this problem is to make the SDIO core
    tell the PM core to ignore driver callbacks, for example by providing
    no-operation suspend/resume callbacks at the bus level for it,
    which is implemented by this change.
    
    Reported-and-tested-by: Neil Brown <neilb@suse.de>
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Signed-off-by: Chris Ball <cjb@laptop.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  28. @noglitch @gregkh

    ARM: at91/USB host: specify and handle properly vbus_pin_active_low

    noglitch committed with gregkh Mar 28, 2012
    commit cca0355 upstream.
    
    Due to an error while handling vbus_pin_active_low in ohci-at91 driver,
    the specification of this property was not good in devices/board files.
    
    Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
    Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  29. @noglitch @gregkh

    USB: ohci-at91: fix vbus_pin_active_low handling

    noglitch committed with gregkh Mar 21, 2012
    commit 1e7caf8 upstream.
    
    The information is not properly taken into account
    for {get|set}_power() functions.
    
    Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
    Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
    Acked-by: Alan Stern <stern@rowland.harvard.edu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  30. @piastry @gregkh

    CIFS: Fix VFS lock usage for oplocked files

    piastry committed with gregkh Mar 28, 2012
    commit 66189be upstream.
    
    We can deadlock if we have a write oplock and two processes
    use the same file handle. In this case the first process can't
    unlock its lock if the second process blocked on the lock in the
    same time.
    
    Fix it by using posix_lock_file rather than posix_lock_file_wait
    under cinode->lock_mutex. If we request a blocking lock and
    posix_lock_file indicates that there is another lock that prevents
    us, wait untill that lock is released and restart our call.
    
    Acked-by: Jeff Layton <jlayton@redhat.com>
    Signed-off-by: Pavel Shilovsky <piastry@etersoft.ru>
    Signed-off-by: Steve French <sfrench@us.ibm.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Something went wrong with that request. Please try again.