1. 14 7月, 2011 1 次提交
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 5d7d5d93
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (21 commits)
        slip: fix wrong SLIP6 ifdef-endif placing
        natsemi: fix another dma-debug report
        sctp: ABORT if receive, reassmbly, or reodering queue is not empty while closing socket
        net: Fix default in docs for tcp_orphan_retries.
        hso: fix a use after free condition
        net/natsemi: Fix module parameter permissions
        XFRM: Fix memory leak in xfrm_state_update
        sctp: Enforce retransmission limit during shutdown
        mac80211: fix TKIP replay vulnerability
        mac80211: fix ie memory allocation for scheduled scans
        ssb: fix init regression of hostmode PCI core
        rtlwifi: rtl8192cu: Add new USB ID for Netgear WNA1000M
        ath9k: Fix tx throughput drops for AR9003 chips with AES encryption
        carl9170: add NEC WL300NU-AG usbid
        cfg80211: fix deadlock with rfkill/sched_scan by adding new mutex
        ath5k: fix incorrect use of drvdata in PCI suspend/resume code
        ath5k: fix incorrect use of drvdata in sysfs code
        Bluetooth: Fix memory leak under page timeouts
        Bluetooth: Fix regression with incoming L2CAP connections
        Bluetooth: Fix hidp disconnect deadlocks and lost wakeup
        ...
      5d7d5d93
  2. 13 7月, 2011 4 次提交
  3. 12 7月, 2011 17 次提交
  4. 11 7月, 2011 11 次提交
  5. 10 7月, 2011 7 次提交
    • G
      hwmon: (pmbus) Improve auto-detection of temperature status register · 22e6b231
      Guenter Roeck 提交于
      It is possible that a PMBus device supports the READ_TEMPERATURE2 and/or
      READ_TEMPERATURE3 registers but does not support READ_TEMPERATURE1.
      Improve temperature status register detection to address this condition.
      Reported-by: NJean Delvare <khali@linux-fr.org>
      Signed-off-by: NGuenter Roeck <guenter.roeck@ericsson.com>
      Acked-by: NJean Delvare <khali@linux-fr.org>
      Cc: stable@kernel.org # 2.6.39+
      22e6b231
    • G
      hwmon: (lm95241) Fix negative temperature results · 0c2a40e2
      Guenter Roeck 提交于
      Negative temperatures were returned in degrees C instead of milli-Degrees C.
      Also, negative temperatures were reported for remote temperature sensors even
      if the chip was configured for positive-only results.
      
      Fix by detecting temperature modes, and by treating negative temperatures
      similar to positive temperatures, with appropriate sign extension.
      Signed-off-by: NGuenter Roeck <guenter.roeck@ericsson.com>
      Acked-by: NJean Delvare <khali@linux-fr.org>
      Cc: stable@kernel.org # 2.6.30+
      0c2a40e2
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · aa4c495e
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
        ALSA: hda - Fix a copmile warning
        ASoC: ak4642: fixup snd_soc_update_bits mask for PW_MGMT2
        ALSA: hda - Change all ADCs for dual-adc switching mode for Realtek
        ASoC: Manage WM8731 ACTIVE bit as a supply widget
        ASoC: Don't set invalid name string to snd_card->driver field
        ASoC: Ensure we delay long enough for WM8994 FLL to lock when starting
        ASoC: Tegra: I2S: Ensure clock is enabled when writing regs
        ASoC: Fix Blackfin I2S _pointer() implementation return in bounds values
        ASoC: tlv320aic3x: Do soft reset to codec when going to bias off state
        ASoC: tlv320aic3x: Don't sync first two registers from register cache
        audio: tlv320aic26: fix PLL register configuration
      aa4c495e
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 · 2169ce92
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
        PCI: conditional resource-reallocation through kernel parameter pci=realloc
      2169ce92
    • L
      Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm · 7fc76936
      Linus Torvalds 提交于
      * 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm:
        ARM: 6994/1: smp_twd: Fix typo in 'twd_timer_rate' printing
        ARM: 6987/1: l2x0: fix disabling function to avoid deadlock
        ARM: 6966/1: ep93xx: fix inverted RTS/DTR signals on uart1
        ARM: 6980/1: mmci: use StartBitErr to detect bad connections
        ARM: 6979/1: mach-vt8500: add forgotten irq_data conversion
        ARM: move memory layout sanity checking before meminfo initialization
        ARM: 6990/1: MAINTAINERS: add entry for ARM PMU profiling and debugging
        ARM: 6989/1: perf: do not start the PMU when no events are present
        ARM: dmabounce: fix map_single() error return value
      7fc76936
    • L
      Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · 8733449b
      Linus Torvalds 提交于
      * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
        drm/radeon/kms: clean up multiple crtc handling for evergreen+ (v2)
      8733449b
    • J
      natsemi: fix another dma-debug report · ff181774
      Jim Cromie 提交于
      commit 2fb83cd6
      Author: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
      Date:   Sun Jul 3 22:34:29 2011 -0700
      
      Above commit fixed previously reported warning, but I later
      noticed another one at shutdown.  This commit fixes it.
      
      ------------[ cut here ]------------
      WARNING: at /home/jimc/projects/lx/linux-2.6/lib/dma-debug.c:820 check_unmap+0x1fe/0x56c()
      natsemi 0000:00:06.0: DMA-API: device driver frees DMA memory with different size [device address=0x0000000007356840] [map size=1538 bytes] [unmap size=1522 bytes]
      Modules linked in: bridge stp llc x_tables ipv6 pc87360 hwmon_vid scx200_hrt pc8736x_gpio scx200_gpio nsc_gpio scx200_acb i2c_core arc4 rtl8180 mac80211 eeprom_93cx6 cfg80211 pcspkr scx200 rfkill ide_gd_mod ide_pci_generic ohci_hcd usbcore sc1200 ide_core [last unloaded: ebtables]
      Pid: 3996, comm: ifconfig Not tainted 3.0.0-rc6-skc-dyndbg+ #104
      Call Trace:
       [<c011ca97>] warn_slowpath_common+0x4a/0x5f
       [<c0261ca5>] ? check_unmap+0x1fe/0x56c
       [<c011cb10>] warn_slowpath_fmt+0x26/0x2a
       [<c0261ca5>] check_unmap+0x1fe/0x56c
       [<c0116505>] ? check_preempt_curr+0x5a/0x6a
       [<c0262186>] debug_dma_unmap_page+0x53/0x5b
       [<c02aaaf9>] pci_unmap_single+0x4d/0x57
       [<c02aab51>] drain_rx+0x4e/0x74
       [<c02acc6e>] netdev_close+0x103/0x1b8
       [<c02f097e>] ? spin_unlock_bh.clone.30+0x12/0x14
       [<c02f10aa>] ? dev_deactivate_many+0xc1/0xef
       [<c02e05e9>] __dev_close_many+0x69/0x86
       [<c02e0625>] __dev_close+0x1f/0x2c
       [<c02e3200>] __dev_change_flags+0x92/0x107
       [<c02e32db>] dev_change_flags+0x13/0x3f
       [<c031e7ea>] devinet_ioctl+0x248/0x4b3
       [<c02e3a9e>] ? dev_ioctl+0x50a/0x54c
       [<c031f509>] inet_ioctl+0x8e/0xa7
       [<c02d506f>] sock_ioctl+0x1b6/0x1da
       [<c02d4eb9>] ? sock_fasync+0x61/0x61
       [<c0183db4>] do_vfs_ioctl+0x44d/0x47f
       [<c0113cdb>] ? do_page_fault+0x268/0x299
       [<c01339d0>] ? __put_cred+0x34/0x36
       [<c0177d83>] ? sys_faccessat+0x13e/0x14b
       [<c0183e14>] sys_ioctl+0x2e/0x4a
       [<c035bc95>] syscall_call+0x7/0xb
      ---[ end trace 7013a1bdac403e56 ]---
      Signed-off-by: NJim Cromie <jim.cromie@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      ff181774