1. 23 2月, 2011 1 次提交
  2. 22 2月, 2011 9 次提交
  3. 21 2月, 2011 1 次提交
    • L
      Revert "tpm_tis: Use timeouts returned from TPM" · e5871372
      Linus Torvalds 提交于
      This reverts commit 9b29050f.
      
      It has caused hibernate regressions, for example Juri Sladby's report:
      
        "I'm unable to hibernate 2.6.37.1 unless I rmmod tpm_tis:
         [10974.074587] Suspending console(s) (use no_console_suspend to debug)
         [10974.103073] tpm_tis 00:0c: Operation Timed out
         [10974.103089] legacy_suspend(): pnp_bus_suspend+0x0/0xa0 returns -62
         [10974.103095] PM: Device 00:0c failed to freeze: error -62"
      
      and Rafael points out that some of the new conditionals in that commit
      seem to make no sense.  This commit needs more work and testing, let's
      revert it for now.
      Reported-by: NNorbert Preining <preining@logic.at>
      Reported-and-requested-by: NJiri Slaby <jirislaby@gmail.com>
      Cc: Stefan Berger <stefanb@linux.vnet.ibm.com>
      Cc: Guillaume Chazarain <guichaz@gmail.com>
      Cc: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
      Acked-by: NRafael J. Wysocki <rjw@sisk.pl>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      e5871372
  4. 20 2月, 2011 1 次提交
  5. 19 2月, 2011 4 次提交
    • A
      cm4000_cs: Fix undefined ops warning · 644e6e4a
      Alan Cox 提交于
      Signed-off-by: NAlan Cox <alan@linux.intel.com>
      Signed-off-by: NDominik Brodowski <linux@dominikbrodowski.net>
      644e6e4a
    • P
      pcmcia vs. MECR on pxa25x/sa1111 · 5b703683
      Pavel Machek 提交于
      After 2.6.34 changes, __pxa2xx_drv_pcmcia_probe() was replaced by
      sa1111_pcmcia_add(). That unfortunately means that configure_sockets()
      is not called, leading to MECR not being set properly, leading to
      strange crashes.
      
      Tested on pxa255+sa1111, I do not have lubbock board nearby. Perhaps
      cleaner solution exists?
      Signed-off-by: NPavel Machek <pma@sysgo.com>
      Signed-off-by: NDominik Brodowski <linux@dominikbrodowski.net>
      5b703683
    • J
      drivers/char/pcmcia/ipwireless/main.c: Convert release_resource to... · d5bb2923
      Julia Lawall 提交于
      drivers/char/pcmcia/ipwireless/main.c: Convert release_resource to release_region/release_mem_region
      
      Request_region should be used with release_region, not release_resource.
      
      This patch contains a number of changes, related to calls to request_region,
      request_mem_region, and the associated error handling code.
      
      1. For the call to request_region, the variable io_resource storing the
      result is dropped.  The call to release_resource at the end of the function
      is changed to a call to release_region with the first two arguments of
      request_region as its arguments.  The same call to release_region is also
      added to release_ipwireless.
      
      2. The first call to request_mem_region is now tested and ret is set to
      -EBUSY if the the call has failed.  This call was associated with the
      initialization of ipw->attr_memory.  But the error handling code was
      testing ipw->common_memory.  The definition of release_ipwireless also
      suggests that this call should be associated with ipw->common_memory, not
      ipw->attr_memory.
      
      3. The second call to request_mem_region is now tested and ret is
      set to -EBUSY if the the call has failed.
      
      4. The various gotos to the error handling code is adjusted so that there
      is no need for ifs.
      
      5. Return the value stored in the ret variable rather than -1.
      
      The semantic match that finds this problem is as follows:
      (http://coccinelle.lip6.fr/)
      
      // <smpl>
      @@
      expression x,E;
      @@
      (
      *x = request_region(...)
      |
      *x = request_mem_region(...)
      )
      ... when != release_region(x)
          when != x = E
      * release_resource(x);
      // </smpl>
      Signed-off-by: NJulia Lawall <julia@diku.dk>
      Signed-off-by: NJiri Kosina <jkosina@suse.cz>
      Signed-off-by: NDominik Brodowski <linux@dominikbrodowski.net>
      d5bb2923
    • J
      hwmon: (lm85) extend to support EMC6D103 chips · f065a93e
      Jan Beulich 提交于
      The interface is identical EMC6D102, so all that needs to be added are
      some definitions and their uses.
      
      Registers apparently missing in EMC6D103S/EMC6D103:A2 compared to EMC6D103:A0,
      EMC6D103:A1, and EMC6D102 (according to the data sheets), but used
      unconditionally in the driver: 62[5:7], 6D[0:7], and 6E[0:7]. For that
      reason, EMC6D103S chips don't get enabled for the time being.
      Signed-off-by: NJan Beulich <jbeulich@novell.com>
      (Guenter Roeck: Replaced EMC6D103_A2 with EMC6D103S per EMC6D103S datasheet)
      Signed-off-by: NGuenter Roeck <guenter.roeck@ericsson.com>
      Cc: stable@kernel.org
      f065a93e
  6. 18 2月, 2011 7 次提交
  7. 17 2月, 2011 17 次提交