15 Oct, 2009

1 commit


13 Oct, 2009

2 commits

  • This works around what I think is actually a bug in rt2860sta which is
    triggered when the hardware "disappears" from beneath the driver, i.e. when
    wireless is toggled off via ACPI. It does so by ensuring that the rfkill
    soft-block flag is set before the hardware is disabled.

    I do not know whether this patch is required if rt2800pci is in use instead
    of rt2860sta; at the time of submission of this patch, I've not been able to
    test this.

    (Ref. http://bugzilla.kernel.org/show_bug.cgi?id=13390)

    Signed-off-by: Darren Salt
    Signed-off-by: Len Brown

    Darren Salt
     
  • Currently the annotation for function eeepc_enable_camera() is
    __init, and refers to a
    function eeepc_hotk_add() which is non-init. Use __devinit for both
    functions which is
    more appropriate and fixes a section mismatch warning.

    We were warned by the following warning:

    LD drivers/platform/x86/built-in.o
    WARNING: drivers/platform/x86/built-in.o(.text+0x12e1): Section
    mismatch in reference from the function eeepc_hotk_add() to the
    function .init.text:eeepc_enable_camera()
    The function eeepc_hotk_add() references
    the function __init eeepc_enable_camera().
    This is often because eeepc_hotk_add lacks a __init
    annotation or the annotation of eeepc_enable_camera is wrong.

    Signed-off-by: Rakib Mullick
    Signed-off-by: Corentin Chary
    Signed-off-by: Len Brown

    Rakib Mullick
     

10 Oct, 2009

1 commit


02 Oct, 2009

1 commit


30 Sep, 2009

1 commit

  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (33 commits)
    sony-laptop: re-read the rfkill state when resuming from suspend
    sony-laptop: check for rfkill hard block at load time
    wext: add back wireless/ dir in sysfs for cfg80211 interfaces
    wext: Add bound checks for copy_from_user
    mac80211: improve/fix mlme messages
    cfg80211: always get BSS
    iwlwifi: fix 3945 ucode info retrieval after failure
    iwlwifi: fix memory leak in command queue handling
    iwlwifi: fix debugfs buffer handling
    cfg80211: don't set privacy w/o key
    cfg80211: wext: don't display BSSID unless associated
    net: Add explicit bound checks in net/socket.c
    bridge: Fix double-free in br_add_if.
    isdn: fix netjet/isdnhdlc build errors
    atm: dereference of he_dev->rbps_virt in he_init_group()
    ax25: Add missing dev_put in ax25_setsockopt
    Revert "sit: stateless autoconf for isatap"
    net: fix double skb free in dcbnl
    net: fix nlmsg len size for skb when error bit is set.
    net: fix vlan_get_size to include vlan_flags size
    ...

    Linus Torvalds
     

29 Sep, 2009

2 commits

  • Without this, the hard-blocked state will be reported incorrectly if
    the hardware switch is changed while the laptop is suspended.

    Signed-off-by: Alan Jenkins
    Tested-by: Norbert Preining
    Acked-by: Mattia Dongili
    Signed-off-by: John W. Linville

    Alan Jenkins
     
  • "I recently (on a flight) I found out that when I boot with the hard-switch
    activated, so turning off all wireless activity on my laptop, the state
    is not correctly announced in /dev/rfkill (reading it with rfkill command,
    or my own gnome applet)...

    After turning off and on again the hard-switch the events were right."

    We can fix this by querying the firmware at load time and calling
    rfkill_set_hw_state().

    Signed-off-by: Alan Jenkins
    Tested-by: Norbert Preining
    Acked-by: Johannes Berg
    Acked-by: Mattia Dongili
    CC: stable@kernel.org
    Signed-off-by: John W. Linville

    Alan Jenkins
     

28 Sep, 2009

4 commits

  • This fixes a warning when the module is unloaded on machines without SPIC.

    ------------[ cut here ]------------
    WARNING: at drivers/base/driver.c:261 driver_unregister+0x6e/0x80()
    Hardware name: OEM
    Unexpected driver unregister!
    Modules linked in: sony_laptop(-) rfkill af_packet i915
    drm i2c_algo_bit cfbcopyarea i2c_core cfbimgblt cfbfillrect binfmt_misc
    ipv6 kvm_intel kvm acpi_cpufreq cpufreq_userspace cpufreq_powersave
    cpufreq_stats acpi_pad ac video output battery pci_slot sbs sbshc
    container iptable_filter ip_tables x_tables ext2 fuse
    snd_hda_codec_realtek snd_hda_intel snd_hda_codec snd_hwdep snd_pcm_oss
    snd_mixer_oss snd_pcm snd_seq_dummy snd_seq_oss snd_seq_midi_event
    snd_seq snd_timer snd_seq_device snd fan sg serio_raw sr_mod cdrom
    soundcore button thermal processor thermal_sys floppy snd_page_alloc
    pcspkr intel_agp evdev [last unloaded: asus_atk0110]
    Pid: 8136, comm: modprobe Not tainted 2.6.31-rc8debug #50
    Call Trace:
    [] ? driver_unregister+0x6e/0x80
    [] warn_slowpath_common+0x87/0xb0
    [] warn_slowpath_fmt+0x64/0x70
    [] ? kobject_release+0x0/0x1f0
    [] ? kobject_put+0x27/0x60
    [] ? bus_put+0x16/0x20
    [] ? bus_remove_driver+0xb6/0xf0
    [] driver_unregister+0x6e/0x80
    [] acpi_bus_unregister_driver+0x10/0x12
    [] sony_laptop_exit+0x2c/0x2e [sony_laptop]
    [] sys_delete_module+0x176/0x230
    [] ? trace_hardirqs_on_caller+0x14d/0x1a0
    [] ? trace_hardirqs_on_thunk+0x3a/0x3f
    [] system_call_fastpath+0x16/0x1b
    ---[ end trace f638b6a59b19703e ]---

    Signed-off-by: Alan Jenkins
    Signed-off-by: Mattia Dongili
    Signed-off-by: Len Brown

    Alan Jenkins
     
  • This is unnecessary as OSPM is supposed to call the method already when
    the device is discovered.

    Signed-off-by: Mattia Dongili
    Signed-off-by: Len Brown

    Mattia Dongili
     
  • The SPIC irq is not really shareable, the IO port cannot be cleared and
    always returns some data so there is no real way to understand if the irq
    is for us or not. Moreover the _PRS acpi method says the irq is not
    shareable.
    In addition to this, in some cases, an additional write to the IO port has
    to be performed in order to properly decode the event received from the
    device. This generates another interrupt which may overlap with the
    previous one. In the future this is going to be important for properly
    decoding events.

    Signed-off-by: Mattia Dongili
    Signed-off-by: Len Brown

    Mattia Dongili
     
  • Having separate drivers for SPIC showed to be useless, only type3 has a
    slightly different behaviour than the others and there seem to be no real
    conflict between them.

    Signed-off-by: Mattia Dongili
    Signed-off-by: Len Brown

    Mattia Dongili
     

27 Sep, 2009

2 commits

  • Fix this problem when CONFIG_THINKPAD_ACPI_HOTKEY_POLL is undefined:

    CHECK drivers/platform/x86/thinkpad_acpi.c
    drivers/platform/x86/thinkpad_acpi.c:1968:21: error: not an lvalue
    CC [M] drivers/platform/x86/thinkpad_acpi.o
    drivers/platform/x86/thinkpad_acpi.c: In function 'tpacpi_hotkey_driver_mask_set':
    drivers/platform/x86/thinkpad_acpi.c:1968: error: lvalue required as left operand of assignment

    Reported-by: Noah Dain
    Reported-by: Audrius Kazukauskas
    Signed-off-by: Henrique de Moraes Holschuh
    Signed-off-by: Len Brown

    Henrique de Moraes Holschuh
     
  • * 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight:
    backlight: new driver for ADP5520/ADP5501 MFD PMICs
    backlight: extend event support to also support poll()
    backlight/eeepc-laptop: Update the backlight state when we change brightness
    backlight/acpi: Update the backlight state when we change brightness
    backlight: Allow drivers to update the core, and generate events on changes
    backlight: switch to da903x driver to dev_pm_ops
    backlight: Add support for the Avionic Design Xanthos backlight device.
    backlight: spi driver for LMS283GF05 LCD
    backlight: move hp680-bl's probe function to .devinit.text
    backlight: Add support for new Apple machines.
    backlight: mbp_nvidia_bl: add support for MacBookAir 1,1
    backlight: Add WM831x backlight driver

    Trivial conflicts due to '#ifdef CONFIG_PM' differences in
    drivers/video/backlight/da903x_bl.c

    Linus Torvalds
     

26 Sep, 2009

1 commit


24 Sep, 2009

1 commit

  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
    Input: add driver for Atmel AT42QT2160 Sensor Chip
    Input: max7359 - use threaded IRQs
    Input: add driver for Maxim MAX7359 key switch controller
    Input: add driver for ADP5588 QWERTY I2C Keypad
    Input: add touchscreen driver for MELFAS MCS-5000 controller
    Input: add driver for OpenCores Keyboard Controller
    Input: dm355evm_keys - remove dm355evm_keys_hardirq
    Input: synaptics_i2c - switch to using __cancel_delayed_work()
    Input: ad7879 - add support for AD7889
    Input: atkbd - rely on input core to restore state on resume
    Input: add generic suspend and resume for input devices
    Input: libps2 - additional locking for i8042 ports

    Linus Torvalds
     

22 Sep, 2009

1 commit


21 Sep, 2009

6 commits

  • Reduce the number of magic numbers in the driver... note that they
    were all explained and documented already.

    Signed-off-by: Henrique de Moraes Holschuh
    Signed-off-by: Len Brown

    Henrique de Moraes Holschuh
     
  • Add an internal API to the driver, to allow subdrivers to request and
    receive HKEY 0x1000 events. This API will be used by the backlight
    (brightness up/down) and upcoming ALSA mixer (volume up/down/mute)
    subdrivers.

    Signed-off-by: Henrique de Moraes Holschuh
    Signed-off-by: Len Brown

    Henrique de Moraes Holschuh
     
  • Update the HKEY event driver to:

    1. Handle better the second-gen firmware, which has no HKEY mask
    support but does report FN+F3, FN+F4 and FN+F12 without the need
    for NVRAM polling.

    a) always make the mask-related attributes available in sysfs;
    b) use DMI quirks to detect the second-gen firmware;
    c) properly report that FN+F3, FN+F4 and FN+F12 are enabled,
    and available even on mask-less second-gen firmware;

    2. Decouple the issuing of hotkey events towards userspace from
    their reception from the firmware. ALSA mixer and brightness
    event reporting support will need this feature.

    3. Clean up the mess in the hotkey driver a great deal. It is
    still very convoluted, and wants a full refactoring into a
    proper event API interface, but that is not going to happen
    today.

    4. Fully reset firmware interface on resume (restore hotkey
    mask and status).

    5. Stop losing polled events for no good reason when changing the
    mask and poll frequencies. We will still lose them when the
    hotkey_source_mask is changed, as well as any that happened
    between driver suspend and driver resume.

    The hotkey subdriver now has the notion of user-space-visible hotkey
    event mask, as well as of the set of "hotkey" events the driver needs
    (because brightness/volume change reports are not just keypress
    reports in most ThinkPad models).

    With this rewrite, the ABI level is bumped to 0x020500 should
    userspace need to know it is dealing with the updated hotkey
    subdriver.

    Signed-off-by: Henrique de Moraes Holschuh
    Signed-off-by: Len Brown

    Henrique de Moraes Holschuh
     
  • HKEY event 0x5010 is useless to us: old ThinkPads don't issue it. Newer
    ThinkPads won't issue it anymore. And all ThinkPads issue 0x1010 and
    0x1011 events.

    Just silently drop it instead of sending it to userspace.

    Signed-off-by: Henrique de Moraes Holschuh
    Signed-off-by: Len Brown

    Henrique de Moraes Holschuh
     
  • hotkey_exit() is only called if hotkey_init() finished sucessfully, or
    by direct calls inside hotkey_init(). The tp_features.hotkey test is
    always true, and just adds to the confusion, remove it. Also, avoid
    calling hotkey_mask_set() when it won't do anything useful.

    Signed-off-by: Henrique de Moraes Holschuh
    Signed-off-by: Len Brown

    Henrique de Moraes Holschuh
     
  • backlight_device_register returns ERR_PTR() in case of problems, and
    the current code would leave that ERR_PTR in ibm_backlight_device.

    The current code paths won't touch it in that situation, but that could
    change. Make sure to set ibm_backlight_device to NULL in the error
    path.

    Signed-off-by: Henrique de Moraes Holschuh
    Signed-off-by: Len Brown

    Henrique de Moraes Holschuh
     

19 Sep, 2009

17 commits