aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-08-03dell-wmi: Add support for eject key on Dell Studio 1555Islam Amer1-1/+1
Fixes pressing the eject key on Dell Studio 1555 does not work and produces message : dell-wmi: Unknown key 0 pressed Signed-off-by: Islam Amer <[email protected]>
2010-08-03rar: Move the RAR driver into the right place as its now cleanAlan Cox9-43/+26
We exit staging rar! rar! rar!... Signed-off-by: Alan Cox <[email protected]> Signed-off-by: Matthew Garrett <[email protected]> Acked-by: Greg Kroah-Hartman <[email protected]>
2010-08-03acer-wmi/hp-wmi: use platform_device_unregister instead of ↵Axel Lin2-2/+2
platform_device_del in module_exit platform_device_unregister will also call platform_device_put() to drop reference count. Signed-off-by: Axel Lin <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2010-08-03wmi: fix memory leak in parse_wdgAxel Lin1-5/+11
This patch properly kfree out.pointer and gblock in error path. Signed-off-by: Axel Lin <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2010-08-03dell-laptop: Add another Dell laptop family to the DMI whitelistRezwanul Kabir1-0/+7
This is to support Precision M4500 and others. Signed-off-by: Rezwanul Kabir <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2010-08-03acer-wmi: fix resource reclaim in acer_wmi_init error pathAxel Lin1-5/+22
This patch fixes the resource reclaim in acer_wmi_init error path. Signed-off-by: Axel Lin <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2010-08-03X86: intel_ips, check for kzalloc properlyJiri Slaby1-4/+5
Stanse found that there are two NULL checks missing in ips_monitor. So check their value too and bail out appropriately if the allocation failed. While at it, add one more kfree to the fail path. It is not necessary now, but may be needed in the future when a new allocation is added. And for completeness. Also remove unneeded initialization of the variables. They are all set right after their declaration. Signed-off-by: Jiri Slaby <[email protected]> Signed-off-by: Matthew Garrett <[email protected]> Acked-by: Jesse Barnes <[email protected]>
2010-08-03hp-wmi: add error handling for hp_wmi_initAxel Lin1-6/+25
Current implementation in hp_wmi_init does not check any error and always return success. This patch properly handles recource reclaim and return err in error path. Signed-off-by: Axel Lin <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2010-08-03intel_scu_ipc: add definitions for vRTC related commandFeng Tang1-0/+6
Signed-off-by: Feng Tang <[email protected]> Signed-off-by: Alan Cox <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2010-08-03classmate-laptop: should check for NULL as retval for rfkill_allocThadeu Lima de Souza Cascardo1-5/+6
rfkill_alloc returns NULL when it fails if RFKILL is enabled. When RFKILL is disabled, its return value of ERR_PTR(-ENODEV) is OK to use as all rfkill functions will work with it, as they are simply empty stubs. Reported-by: Alan Jenkins <[email protected]> Cc: Johannes Berg <[email protected]> Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Signed-off-by: Thadeu Lima de Souza Cascardo <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2010-08-03IPS driver: add GPU busy and turbo checkingJesse Barnes1-13/+17
Be sure to enable GPU turbo by default at load time and check GPU busy and MCP exceeded status correctly. Also fix up CPU power comparison and work around buggy MCH temp reporting. Signed-off-by: Jesse Barnes <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2010-08-03x86 platform driver: intelligent power sharing driverJesse Barnes4-0/+1675
Intel Core i3/5 platforms with integrated graphics support both CPU and GPU turbo mode. CPU turbo mode is opportunistic: the CPU will use any available power to increase core frequencies if thermal headroom is available. The GPU side is more manual however; the graphics driver must monitor GPU power and temperature and coordinate with a core thermal driver to take advantage of available thermal and power headroom in the package. The intelligent power sharing (IPS) driver is intended to coordinate this activity by monitoring MCP (multi-chip package) temperature and power, allowing the CPU and/or GPU to increase their power consumption, and thus performance, when possible. The goal is to maximize performance within a given platform's TDP (thermal design point). Signed-off-by: Jesse Barnes <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2010-08-03timer: add on-stack deferrable timer interfacesJesse Barnes2-0/+28
In some cases (for instance with kernel threads) it may be desireable to use on-stack deferrable timers to get their power saving benefits. Add interfaces to support this for the IPS driver. Signed-off-by: Jesse Barnes <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2010-08-03platform/x86: msi-laptop depends on SERIO_I8042Randy Dunlap1-0/+1
msi-laptop uses i8042_*() interfaces, so it should depend on SERIO_I8042. E.g., when SERIO_I8042=m and MSI_LAPTOP=y: msi-laptop.c:(.text+0x18a7fe): undefined reference to `i8042_install_filter' msi-laptop.c:(.init.text+0xd69d): undefined reference to `i8042_remove_filter' msi-laptop.c:(.exit.text+0x19c3): undefined reference to `i8042_remove_filter' Signed-off-by: Randy Dunlap <[email protected]> Signed-off-by: Matthew Garrett <[email protected]> Cc: Lennart Poettering <[email protected]>
2010-08-03classmate-laptop: depends on RFKILL or RFKILL=nThadeu Lima de Souza Cascardo1-0/+1
Randy Dunlap has reported that building classmate-laptop fails when CONFIG_RFKILL=m and CONFIG_ACPI_CMPC=y. He suggested depending on RFKILL, but, then, it will not be possible to select classmate-laptop when RFKILL is off. There's no known problem with building and using classmate-laptop with RFKILL off. So depend on RFKILL or RFKILL=n. Signed-off-by: Thadeu Lima de Souza Cascardo <[email protected]> Signed-off-by: Matthew Garrett <[email protected]> Reported-by: Randy Dunlap <[email protected]> Cc: Randy Dunlap <[email protected]> Cc: [email protected] Cc: Daniel Oliveira Nascimento <[email protected]>
2010-08-03drivers/platform/x86: Eliminate a NULL pointer dereferenceJulia Lawall1-3/+7
Give different error messages if device_enum is NULL or if its type field has the wrong value. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @r exists@ expression E,E1; identifier f; statement S1,S2,S3; @@ if ((E == NULL && ...) || ...) { ... when != if (...) S1 else S2 when != E = E1 * E->f ... when any return ...; } else S3 // </smpl> Signed-off-by: Julia Lawall <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2010-08-03X86 platform: hp-wmi Better match the HP WMI query interfaceThomas Renninger1-30/+107
- Improve error handling, by explictly return zero for success, error otherwise - WMI query command can have arbitrary input sized params - WMI query command can have specific output sized params (0, 4, 128,..) byte I like to go on here, but this is a rather intrusive change that should be looked at first. I am sure the one or other thing can be done better or there might be typo/bug somewhere. This did not get any testing yet, only compile tested. Next steps could be: - Eventually introduce hp_wmi_perform_{read,write}_query macros - Introduce new wireless query interface (0x1B) - more Signed-off-by: Thomas Renninger <[email protected]> Signed-off-by: Matthew Garrett <[email protected]> CC: [email protected] CC: [email protected]
2010-08-03x86 platform drivers: hp-wmi fix buffer size depending on ACPI versionThomas Renninger1-7/+27
Depending on ACPI version (1.0 -> 32 bit) an integer could be 32 or 64 bit long. _WED internal concatenates two integers and the return value will be 8 byte (2* 32 bit) or 16 byte (2* 64 bit) long, depending on the ACPI version. Also the data send with the WMI event is defined to be splitted into: - Event ID -> 4 bytes - Event Data -> 4 bytes This gets messed up with new ACPI versions. But it's a HP BIOS bug that may get fixed in the future -> Support both, 16 and 8 byte _WED buffers. Also the wrong assumption that from the event data sent, only the first byte is relevant got cleaned up that it fits event_id/event_data as described above. Signed-off-by: Thomas Renninger <[email protected]> CC: [email protected] Signed-off-by: Matthew Garrett <[email protected]> CC: [email protected] CC: [email protected]
2010-08-03x86 platform drivers: hp-wmi Set placeholder for unimplemented eventsThomas Renninger1-0/+15
Rather than print unknown events when we know what caused them Signed-off-by: Thomas Renninger <[email protected]> Signed-off-by: Matthew Garrett <[email protected]> CC: [email protected] CC: [email protected]
2010-08-03x86 platform drivers: hp-wmi Add media key 0x20e8Thomas Renninger1-0/+1
Signed-off-by: Thomas Renninger <[email protected]> Signed-off-by: Matthew Garrett <[email protected]> CC: [email protected] CC: [email protected]
2010-08-03x86 platform drivers: hp-wmi Use consistent prefix string for messages.Thomas Renninger1-4/+6
Signed-off-by: Thomas Renninger <[email protected]> Signed-off-by: Matthew Garrett <[email protected]> CC: [email protected] CC: [email protected]
2010-08-03x86 platform drivers: hp-wmi Catch and log unkown event and key codes correctlyThomas Renninger1-3/+5
Signed-off-by: Thomas Renninger <[email protected]> Signed-off-by: Matthew Garrett <[email protected]> CC: [email protected] CC: [email protected]
2010-08-03x86 platform drivers: hp-wmi Reorder event id processingThomas Renninger1-19/+32
Event id 0x4 defines the hotkey event. No need (or even wrong) to query HPWMI_HOTKEY_QUERY if event id is != 0x4. Reorder the eventcode conditionals and use switch case instead of if/else. Use an enum for the event ids cases. Signed-off-by: Thomas Renninger <[email protected]> Signed-off-by: Matthew Garrett <[email protected]> CC: [email protected] CC: [email protected]
2010-08-03intel_menlow: fix memory leaks in error pathAxel Lin1-11/+22
This patch includes below fixes in error path: 1. fix a memory leak if device_create_file failed in intel_menlow_add_one_attribute 2. properly free added attributes before return error in intel_menlow_register_sensor error handler 3. properly call acpi_bus_unregister_driver before return error in intel_menlow_module_init Signed-off-by: Axel Lin <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2010-08-03l2tp: fix export of header file for userspaceJames Chapman1-0/+1
The header file l2tp.h should be exported to the installed include/linux/ tree for userspace programs. This patch fixes compilation errors in L2TP userspace apps which want to use the new L2TP support introduced in 2.6.35. Signed-off-by: James Chapman <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-08-03can-raw: Fix skb_orphan_try handlingOliver Hartkopp2-1/+7
Commit fc6055a5ba31e2c14e36e8939f9bf2b6d586a7f5 (net: Introduce skb_orphan_try()) allows an early orphan of the skb and takes care on tx timestamping, which needs the sk-reference in the skb on driver level. So does the can-raw socket, which has not been taken into account here. The patch below adds a 'prevent_sk_orphan' bit in the skb tx shared info, which fixes the problem discovered by Matthias Fuchs here: http://marc.info/?t=128030411900003&r=1&w=2 Even if it's not a primary tx timestamp topic it fits well into some skb shared tx context. Or should be find a different place for the information to protect the sk reference until it reaches the driver level? Signed-off-by: Oliver Hartkopp <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-08-03Revert "net: remove zap_completion_queue"David S. Miller2-3/+32
This reverts commit 15e83ed78864d0625e87a85f09b297c0919a4797. As explained by Johannes Berg, the optimization made here is invalid. Or, at best, incomplete. Not only destructor invocation, but conntract entry releasing must be executed outside of hw IRQ context. So just checking "skb->destructor" is insufficient. Signed-off-by: David S. Miller <[email protected]>
2010-08-03UBIFS: fix a memory leak on error path.Matthieu CASTET1-1/+1
In 'mount_ubifs()', in case of 'ubifs_leb_unmap()' falure, free allocated resources. Signed-off-by: Matthieu CASTET <[email protected]> Signed-off-by: Artem Bityutskiy <[email protected]>
2010-08-02net: cleanup inclusionChangli Gao1-2/+0
Commit ab95bfe01f9872459c8678572ccadbf646badad0 replaces bridge and macvlan hooks in __netif_receive_skb(), so dev.c doesn't need to include their headers. Signed-off-by: Changli Gao <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-08-02Merge branch 'master' of ↵David S. Miller7-12/+19
master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: drivers/net/e1000e/hw.h net/bridge/br_device.c net/bridge/br_input.c
2010-08-02phy/marvell: add 88e1121 interface mode supportCyril Chemparathy1-3/+32
This patch adds support for RGMII RX/TX delay configuration on marvell 88e1121 and derivatives. With this patch, PHY_INTERFACE_MODE_RGMII_*ID modes are now supported on these devices. Signed-off-by: Cyril Chemparathy <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-08-02u32: negative offset fixstephen hemminger1-2/+4
It was possible to use a negative offset in a u32 match to reference the ethernet header or other parts of the link layer header. This fixes the regression caused by: commit fbc2e7d9cf49e0bf89b9e91fd60a06851a855c5d Author: Changli Gao <[email protected]> Date: Wed Jun 2 07:32:42 2010 -0700 cls_u32: use skb_header_pointer() to dereference data safely Signed-off-by: Stephen Hemminger <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-08-02net: Fix a typo from "dev" to "ndev"Henrique Camargo1-2/+2
The typo was causing compilation errors since "dev" was not defined. Signed-off-by: Henrique Camargo <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-08-02igb: Use irq_synchronize per vector when using MSI-XEmil Tantilov1-1/+7
Synchronize all IRQs when using MSI-X. Similar to ixgbe. Issue was reported on e1000e, but the patch is also valid for igb. CC: Jean Delvare <[email protected]> Signed-off-by: Emil Tantilov <[email protected]> Tested-by: Jeff Pieper <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-08-02ixgbevf: fix null pointer dereference due to filter being set for VLAN 0Alexander Duyck1-11/+1
This change corrects an issue that resulted in a null pointer dereference for the addition of VLAN 0 without any VLANs being registered. Also this code removes some unnecessary checks for defines and the unnecessary setting of VLAN flags since that is now handled within the kernel via the vlan_features. Signed-off-by: Alexander Duyck <[email protected]> Tested-by: Emil Tantilov <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-08-02e1000e: Fix irq_synchronize in MSI-X caseJeff Kirsher2-8/+19
Based on original patch/work from Jean Delvare <[email protected]> Synchronize all IRQs when in MSI-X IRQ mode. Jean's original patch hard coded the sync with the 3 possible vectors, this patch incorporates more flexibility for the future and aligns with how igb stores the number of vectors into the adapter structure. CC: Jean Delvare <[email protected]> Cc: Jesse Brandeburg <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]> Tested-by: Jeff Pieper <[email protected]> Acked-by: Bruce Allan <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-08-02e1000e: register pm_qos request on hardware activationFlorian Mickler1-12/+11
The pm_qos_add_request call has to register the pm_qos request with the pm_qos susbsystem before first use of the pm_qos request via pm_qos_update_request. As pm_qos changed to use plists there is no benefit in registering and unregistering the pm_qos request on ifup/ifdown and thus we move the registering into e1000_open and the unregistering in e1000_close. This fixes the following warning: [ 1.786060] WARNING: at kernel/pm_qos_params.c:264 pm_qos_update_request+0x28/0x54() [ 1.786088] Hardware name: Latitude E6500 [ 1.787045] pm_qos_update_request() called for unknown object [ 1.787966] Modules linked in: [ 1.788940] Pid: 1, comm: swapper Not tainted 2.6.35-rc5-mmotm0719 #1 [ 1.790035] Call Trace: [ 1.791121] [<ffffffff81037335>] warn_slowpath_common+0x80/0x98 [ 1.792205] [<ffffffff810373e1>] warn_slowpath_fmt+0x41/0x43 [ 1.793279] [<ffffffff81057c14>] pm_qos_update_request+0x28/0x54 [ 1.794347] [<ffffffff8134889e>] e1000_configure+0x421/0x459 [ 1.795393] [<ffffffff8134afbd>] e1000_open+0xbd/0x37c [ 1.796436] [<ffffffff8105743a>] ? raw_notifier_call_chain+0xf/0x11 [ 1.797491] [<ffffffff8145f948>] __dev_open+0xae/0xe2 [ 1.798547] [<ffffffff8145f997>] dev_open+0x1b/0x49 [ 1.799612] [<ffffffff8146e36e>] netpoll_setup+0x84/0x259 [ 1.800685] [<ffffffff81b5037c>] init_netconsole+0xbc/0x21f [ 1.801744] [<ffffffff81b5026c>] ? sir_wq_init+0x0/0x35 [ 1.802793] [<ffffffff81b502c0>] ? init_netconsole+0x0/0x21f [ 1.803845] [<ffffffff810002ff>] do_one_initcall+0x7a/0x12f [ 1.804885] [<ffffffff81b2ccae>] kernel_init+0x138/0x1c2 [ 1.805915] [<ffffffff81003554>] kernel_thread_helper+0x4/0x10 [ 1.806937] [<ffffffff81590e00>] ? restore_args+0x0/0x30 [ 1.807955] [<ffffffff81b2cb76>] ? kernel_init+0x0/0x1c2 [ 1.808958] [<ffffffff81003550>] ? kernel_thread_helper+0x0/0x10 [ 1.809958] ---[ end trace 84b562a00a60539e ]--- Signed-off-by: Florian Mickler <[email protected]> Tested-by: Valdis Kletnieks <[email protected]> Tested-by: Jeff Pieper <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-08-02Merge branch 'next' into for-linusDmitry Torokhov56-983/+6495
2010-08-02Input: adp5588-keypad - fix NULL dereference in adp5588_gpio_add()Dmitry Torokhov1-29/+37
The kpad structure is assigned to i2c client via i2s_set_clientdata() at the end of adp5588_probe(), but in adp5588_gpio_add() we tried to access it (via dev_get_drvdata! which is not nice at all) causing an oops. Let's pass pointer to kpad directly into adp5588_gpio_add() and adp5588_gpio_remove() to avoid accessing driver data before it is set up. Also split out building of gpiomap into a separate function to clear the logic. Reported-by: Michael Hennerich <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-08-02ip_fragment: fix subtracting PPPOE_SES_HLEN from mtu twiceChangli Gao1-4/+2
6c79bf0f2440fd250c8fce8d9b82fcf03d4e8350 subtracts PPPOE_SES_HLEN from mtu at the front of ip_fragment(). So the later subtraction should be removed. The MTU of 802.1q is also 1500, so MTU should not be changed. Signed-off-by: Changli Gao <[email protected]> Signed-off-by: Bart De Schuymer <[email protected]> ---- net/ipv4/ip_output.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) Signed-off-by: Bart De Schuymer <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-08-02net: Add getsockopt support for TCP thin-streamsJosh Hunt1-0/+6
Initial TCP thin-stream commit did not add getsockopt support for the new socket options: TCP_THIN_LINEAR_TIMEOUTS and TCP_THIN_DUPACK. This adds support for them. Signed-off-by: Josh Hunt <[email protected]> Tested-by: Andreas Petlund <[email protected]> Acked-by: Andreas Petlund <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-08-02cxgb4: update driver versionDimitris Michailidis1-1/+1
Signed-off-by: Dimitris Michailidis <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-08-02cxgb4: add new PCI IDsDimitris Michailidis1-0/+10
Signed-off-by: Dimitris Michailidis <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-08-02cxgb4: fix wrong shift directionDimitris Michailidis1-1/+1
Signed-off-by: Dimitris Michailidis <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-08-02cxgb4: support running the driver on PCI functions besides 0Dimitris Michailidis3-72/+97
Add support for running the driver on any PCI function. Mostly this entails replacing a constant 0 in a number of calls with the variable function number. Signed-off-by: Dimitris Michailidis <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-08-02cxgb4: advertise NETIF_F_TSO_ECNDimitris Michailidis1-4/+6
The device supports TSO+ECN. Signed-off-by: Dimitris Michailidis <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-08-02cxgb4: get on-chip queue info from FW and create a memory window for themDimitris Michailidis4-2/+29
Get info about the availability of Tx on-chip queues from FW and if they are supported set up a memory window for them. iw_cxgb4 will be using them. Move the existing window setup later in the init sequence, after we have collected the new info. Signed-off-by: Dimitris Michailidis <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-08-02cxgb4: fix TSO descriptorsDimitris Michailidis1-11/+11
Commit 1704d74894912b8ecc3e95cecd7bde336a0b1bf2 ("cxgb4vf: small changes to message processing structures/macros") was incomplete and causes cxgb4 to write bad TSO descriptors. Fix that up by reverting the offending part of that commit and adjusting field accesses now that they are one level deeper. Signed-off-by: Dimitris Michailidis <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-08-02cxgb4: don't offload Rx checksums for IPv6 fragmentsDimitris Michailidis2-3/+6
The checksum provided by the device doesn't include the L3 headers, as IPv6 expects. Signed-off-by: Dimitris Michailidis <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-08-02cxgb4: disable an interrupt that is neither used nor servicedDimitris Michailidis1-1/+1
Signed-off-by: Dimitris Michailidis <[email protected]> Signed-off-by: David S. Miller <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.