1. 24 2月, 2011 2 次提交
  2. 23 2月, 2011 13 次提交
  3. 22 2月, 2011 9 次提交
  4. 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
  5. 20 2月, 2011 1 次提交
  6. 19 2月, 2011 5 次提交
    • 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
    • R
      Input: tegra-kbc - add function keymap · 4e8b65f6
      Rakesh Iyer 提交于
      Add Fn keymap support to allow for internal processing of Fn keys.
      Signed-off-by: NRakesh Iyer <riyer@nvidia.com>
      Signed-off-by: NDmitry Torokhov <dtor@mail.ru>
      4e8b65f6
  7. 18 2月, 2011 9 次提交
    • C
      hwmon: (k10temp) add support for AMD Family 12h/14h CPUs · aa4790a6
      Clemens Ladisch 提交于
      Add the PCI ID to support the internal temperature sensor of the
      AMD "Llano" and "Brazos" processor families.
      Signed-off-by: NClemens Ladisch <clemens@ladisch.de>
      Cc: stable@kernel.org # ca86828c: x86, AMD, PCI: Add AMD northbridge PCI device
      Cc: stable@kernel.org
      Signed-off-by: NGuenter Roeck <guenter.roeck@ericsson.com>
      aa4790a6
    • J
      RTC: Re-enable UIE timer/polling emulation · 456d66ec
      John Stultz 提交于
      This patch re-enables UIE timer/polling emulation for rtc devices
      that do not support alarm irqs.
      
      CC: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
      CC: Thomas Gleixner <tglx@linutronix.de>
      Reported-by: NUwe Kleine-König <u.kleine-koenig@pengutronix.de>
      Tested-by: NUwe Kleine-König <u.kleine-koenig@pengutronix.de>
      Signed-off-by: NJohn Stultz <john.stultz@linaro.org>
      456d66ec
    • J
      RTC: Revert UIE emulation removal · 6e57b1d6
      John Stultz 提交于
      Uwe pointed out that my alarm based UIE emulation is not sufficient
      to replace the older timer/polling based UIE emulation on devices
      where there is no alarm irq. This causes rtc devices without alarms
      to return -EINVAL to UIE ioctls. The fix is to re-instate the old
      timer/polling method for devices without alarm irqs.
      
      This patch reverts the following commits:
      042620a0 - Remove UIE emulation
      1daeddd5 - Cleanup removed UIE emulation declaration
      b5cc8ca1 - Remove Kconfig symbol for UIE emulation
      
      The emulation mode will still need to be wired-in with a following
      patch before it will work.
      
      CC: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
      CC: Thomas Gleixner <tglx@linutronix.de>
      Reported-by: NUwe Kleine-König <u.kleine-koenig@pengutronix.de>
      Signed-off-by: NJohn Stultz <john.stultz@linaro.org>
      6e57b1d6
    • U
      RTC: Release mutex in error path of rtc_alarm_irq_enable · 516373b8
      Uwe Kleine-König 提交于
      On hardware that doesn't support alarm interrupts, rtc_alarm_irq_enable
      could return without releasing the ops_lock mutex.
      
      This was introduced in
      	aa0be0f4 (RTC: Propagate error handling via rtc_timer_enqueue properly)
      
      This patch corrects the issue by only returning once the mutex is
      released.
      
      [john.stultz: Reworded the commit log]
      Signed-off-by: NUwe Kleine-König <u.kleine-koenig@pengutronix.de>
      Signed-off-by: NJohn Stultz <john.stultz@linaro.org>
      516373b8
    • G
      Revert "USB: Reset USB 3.0 devices on (re)discovery" · 9ce4f80f
      Greg Kroah-Hartman 提交于
      This reverts commit 637d11bf.  Sarah
      wants to tweak it some more before it's applied to the tree.
      
      Cc: Luben Tuikov <ltuikov@yahoo.com>
      Cc: Sarah Sharp <sarah.a.sharp@linux.intel.com>
      Cc: Alan Stern <stern@rowland.harvard.edu>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      9ce4f80f
    • M
      tg3: Restrict phy ioctl access · ed199fac
      Matt Carlson 提交于
      If management firmware is present and the device is down, the firmware
      will assume control of the phy.  If a phy access were allowed from the
      host, it will collide with firmware phy accesses, resulting in
      unpredictable behavior.  This patch fixes the problem by disallowing phy
      accesses during the problematic condition.
      Signed-off-by: NMatt Carlson <mcarlson@broadcom.com>
      Reviewed-by: NMichael Chan <mchan@broadcom.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      ed199fac
    • I
      drivers/net: Call netif_carrier_off at the end of the probe · 0d672e9f
      Ivan Vecera 提交于
      Without calling of netif_carrier_off at the end of the probe the operstate
      is unknown when the device is initially opened. By default the carrier is
      on so when the device is opened and netif_carrier_on is called the link
      watch event is not fired and operstate remains zero (unknown).
      
      This patch fixes this behavior in forcedeth and r8169.
      Signed-off-by: NIvan Vecera <ivecera@redhat.com>
      Acked-by: NFrancois Romieu <romieu@fr.zoreil.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      0d672e9f
    • M
      IB/qib: Prevent double completions after a timeout or RNR error · c0af2c05
      Mike Marciniszyn 提交于
      There is a double completion associated with error handling for RC QPs.
      
      The sequence is:
      
       - The do_rc_ack() routine fields an RNR nack and there are 0
         rnr_retries configured on the QP.
       - qib_error_qp() stops the pending timer
       - qib_rc_send_complete() is called from sdma_complete()
       - qib_rc_send_complete() starts the timer because the msb of the psn
         just completed says an ack is needed.
       - a bunch of flushes occur as ipoib posts WQEs to an error'ed QP
       - rc_timeout() calls qib_restart_rc()
       - qib_restart_rc() calls qib_send_complete() with a
         IB_WC_RETRY_EXC_ERR on a wqe that has already been completed in the
         past
      
      The fix avoids starting the timer since another packet will never
      arrive.
      Signed-off-by: NMike Marciniszyn <mike.marciniszyn@qlogic.com>
      Signed-off-by: NRoland Dreier <roland@purestorage.com>
      c0af2c05
    • J
      USB: musb: omap2430: fix kernel panic on reboot · 19b9a83e
      Johan Hovold 提交于
      Cancel idle timer in musb_platform_exit.
      
      The idle timer could trigger after clock had been disabled leading to
      kernel panic when MUSB_DEVCTL is accessed in musb_do_idle on 2.6.37.
      
      The fault below is no longer triggered on 2.6.38-rc4 (clock is disabled
      later, and only if compiled as a module, and the offending memory access
      has moved) but the timer should be cancelled nonetheless.
      
      Rebooting... musb_hdrc musb_hdrc: remove, state 4
      usb usb1: USB disconnect, address 1
      musb_hdrc musb_hdrc: USB bus 1 deregistered
      Unhandled fault: external abort on non-linefetch (0x1028) at 0xfa0ab060
      Internal error: : 1028 [#1] PREEMPT
      last sysfs file: /sys/kernel/uevent_seqnum
      Modules linked in:
      CPU: 0    Not tainted  (2.6.37+ #6)
      PC is at musb_do_idle+0x24/0x138
      LR is at musb_do_idle+0x18/0x138
      pc : [<c02377d8>]    lr : [<c02377cc>]    psr: 80000193
      sp : cf2bdd80  ip : cf2bdd80  fp : c048a20c
      r10: c048a60c  r9 : c048a40c  r8 : cf85e110
      r7 : cf2bc000  r6 : 40000113  r5 : c0489800  r4 : cf85e110
      r3 : 00000004  r2 : 00000006  r1 : fa0ab000  r0 : cf8a7000
      Flags: Nzcv  IRQs off  FIQs on  Mode SVC_32  ISA ARM  Segment user
      Control: 10c5387d  Table: 8faac019  DAC: 00000015
      Process reboot (pid: 769, stack limit = 0xcf2bc2f0)
      Stack: (0xcf2bdd80 to 0xcf2be000)
      dd80: 00000103 c0489800 c02377b4 c005fa34 00000555 c0071a8c c04a3858 cf2bdda8
      dda0: 00000555 c048a00c cf2bdda8 cf2bdda8 1838beb0 00000103 00000004 cf2bc000
      ddc0: 00000001 00000001 c04896c8 0000000a 00000000 c005ac14 00000001 c003f32c
      dde0: 00000000 00000025 00000000 cf2bc000 00000002 00000001 cf2bc000 00000000
      de00: 00000001 c005ad08 cf2bc000 c002e07c c03ec039 ffffffff fa200000 c0033608
      de20: 00000001 00000000 cf852c14 cf81f200 c045b714 c045b708 cf2bc000 c04a37e8
      de40: c0033c04 cf2bc000 00000000 00000001 cf2bde68 cf2bde68 c01c3abc c004f7d8
      de60: 60000013 ffffffff c0033c04 00000000 01234567 fee1dead 00000000 c006627c
      de80: 00000001 c00662c8 28121969 c00663ec cfa38c40 cf9f6a00 cf2bded0 cf9f6a0c
      dea0: 00000000 cf92f000 00008914 c02cd284 c04a55c8 c028b398 c00715c0 becf24a8
      dec0: 30687465 00000000 00000000 00000000 00000002 1301a8c0 00000000 00000000
      dee0: 00000002 1301a8c0 00000000 00000000 c0450494 cf527920 00011f10 cf2bdf08
      df00: 00011f10 cf2bdf10 00011f10 cf2bdf18 c00f0b44 c004f7e8 cf2bdf18 cf2bdf18
      df20: 00011f10 cf2bdf30 00011f10 cf2bdf38 cf401300 cf486100 00000008 c00d2b28
      df40: 00011f10 cf401300 00200200 c00d3388 00011f10 cfb63a88 cfb63a80 c00c2f08
      df60: 00000000 00000000 cfb63a80 00000000 cf0a3480 00000006 c0033c04 cfb63a80
      df80: 00000000 c00c0104 00000003 cf0a3480 cfb63a80 00000000 00000001 00000004
      dfa0: 00000058 c0033a80 00000000 00000001 fee1dead 28121969 01234567 00000000
      dfc0: 00000000 00000001 00000004 00000058 00000001 00000001 00000000 00000001
      dfe0: 4024d200 becf2cb0 00009210 4024d218 60000010 fee1dead 00000000 00000000
      [<c02377d8>] (musb_do_idle+0x24/0x138) from [<c005fa34>] (run_timer_softirq+0x1a8/0x26)
      [<c005fa34>] (run_timer_softirq+0x1a8/0x26c) from [<c005ac14>] (__do_softirq+0x88/0x13)
      [<c005ac14>] (__do_softirq+0x88/0x138) from [<c005ad08>] (irq_exit+0x44/0x98)
      [<c005ad08>] (irq_exit+0x44/0x98) from [<c002e07c>] (asm_do_IRQ+0x7c/0xa0)
      [<c002e07c>] (asm_do_IRQ+0x7c/0xa0) from [<c0033608>] (__irq_svc+0x48/0xa8)
      Exception stack(0xcf2bde20 to 0xcf2bde68)
      de20: 00000001 00000000 cf852c14 cf81f200 c045b714 c045b708 cf2bc000 c04a37e8
      de40: c0033c04 cf2bc000 00000000 00000001 cf2bde68 cf2bde68 c01c3abc c004f7d8
      de60: 60000013 ffffffff
      [<c0033608>] (__irq_svc+0x48/0xa8) from [<c004f7d8>] (sub_preempt_count+0x0/0xb8)
      Code: ebf86030 e5940098 e594108c e5902010 (e5d13060)
      ---[ end trace 3689c0d808f9bf7c ]---
      Kernel panic - not syncing: Fatal exception in interrupt
      
      Cc: stable <stable@kernel.org>
      Signed-off-by: NJohan Hovold <jhovold@gmail.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      19b9a83e