aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-08-17gpiolib: devres: use correct structure type name in sizeofJulia Lawall1-1/+1
Correct typo in the name of the type given to sizeof. Because it is the size of a pointer that is wanted, the typo has no impact on compilation or execution. This problem was found using Coccinelle (http://coccinelle.lip6.fr/). The semantic patch used can be found in message 0 of this patch series. Signed-off-by: Julia Lawall <[email protected]> Acked-by: Alexandre Courbot <[email protected]> Signed-off-by: Linus Walleij <[email protected]>
2014-08-17MAINTAINERS: Change maintainer for gpio-bcm-kona.cMarkus Mayer1-1/+1
Since I no longer have access to the hardware, Ray Jui will take over maintaining the Kona GPIO driver. In addition, my former e-mail addresses [email protected] and [email protected] will cease to function shortly. So, I used an address I can still be reached at as the "author" addess here. Signed-off-by: Markus Mayer <[email protected]> Signed-off-by: Markus Mayer <[email protected]> Signed-off-by: Linus Walleij <[email protected]>
2014-08-17ata: ahci_tegra: Change include to fix compilationMikko Perttunen1-1/+1
Before this patch, the driver included <linux/tegra-powergate.h>, which was effectively renamed to <soc/tegra/pmc.h> at about the same time the ahci_tegra series landed. Fix the include path so that the driver compiles. Signed-off-by: Mikko Perttunen <[email protected]> Acked-by: Thierry Reding <[email protected]> Signed-off-by: Tejun Heo <[email protected]>
2014-08-17pata_samsung_cf: change ret type to signedArjun Sreedharan1-1/+1
Change return type to signed int since it could be a negative errno. Signed-off-by: Arjun Sreedharan <[email protected]> Signed-off-by: Tejun Heo <[email protected]>
2014-08-17ahci_xgene: Removing NCQ support from the APM X-Gene SoC AHCI SATA Host ↵Suman Tripathi1-2/+2
Controller driver. This patch removes the NCQ support from the APM X-Gene SoC AHCI Host Controller driver as it doesn't support it. Signed-off-by: Loc Ho <[email protected]> Signed-off-by: Suman Tripathi <[email protected]> Signed-off-by: Tejun Heo <[email protected]> Cc: [email protected]
2014-08-17CIFS: Fix wrong directory attributes after renamePavel Shilovsky1-0/+6
When we requests rename we also need to update attributes of both source and target parent directories. Not doing it causes generic/309 xfstest to fail on SMB2 mounts. Fix this by marking these directories for force revalidating. Cc: <[email protected]> Signed-off-by: Pavel Shilovsky <[email protected]> Signed-off-by: Steve French <[email protected]>
2014-08-17CIFS: Fix SMB2 readdir error handlingPavel Shilovsky7-8/+25
SMB2 servers indicates the end of a directory search with STATUS_NO_MORE_FILE error code that is not processed now. This causes generic/257 xfstest to fail. Fix this by triggering the end of search by this error code in SMB2_query_directory. Also when negotiating CIFS protocol we tell the server to close the search automatically at the end and there is no need to do it itself. In the case of SMB2 protocol, we need to close it explicitly - separate close directory checks for different protocols. Cc: <[email protected]> Signed-off-by: Pavel Shilovsky <[email protected]> Signed-off-by: Steve French <[email protected]>
2014-08-17[CIFS] Possible null ptr deref in SMB2_tconSteve French1-1/+2
As Raphael Geissert pointed out, tcon_error_exit can dereference tcon and there is one path in which tcon can be null. Signed-off-by: Steve French <[email protected]> CC: Stable <[email protected]> # v3.7+ Reported-by: Raphael Geissert <[email protected]>
2014-08-16tipc: fix message importance range checkErik Hugne2-2/+4
Commit 3b4f302d8578 ("tipc: eliminate redundant locking") introduced a bug by removing the sanity check for message importance, allowing programs to assign any value to the msg_user field. This will mess up the packet reception logic and may cause random link resets. Signed-off-by: Erik Hugne <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2014-08-16net: phy: smsc: move smsc_phy_config_init reset part in a soft_reset functionGwenhael Goavec-Merou1-12/+21
On the one hand, phy_device.c provides a generic reset function if the phy driver does not provide a soft_reset pointer. This generic reset does not take into account the state of the phy, with a potential failure if the phy is in powerdown mode. On the other hand, smsc driver provides a function with both correct reset behaviour and configuration. This patch moves the reset part into a new smsc_phy_reset function and provides the soft_reset pointer to have a correct reset behaviour by default. Signed-off-by: Gwenhael Goavec-Merou <[email protected]> Reviewed-by: Florian Fainelli <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2014-08-16Merge branch 'master' of ↵David S. Miller2-13/+33
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net Jeff Kirsher says: ==================== Intel Wired LAN Driver Updates 2014-08-15 This series contains fixes to i40e only. Anjali provides two fixes for i40e, first adds a check for non-active VF before sending admin queue messages to the VFS. This resolves a potential kernel panic which would happen whenever we got a Tx hang and there were VFS that were not up or enabled. The second fix adds additional checks so that we do try to access a VF that is not up or enabled which would dereference a null pointer. Jesse fixes a i40e PTP bug where the hang detection routine was never being run when PTP was enabled. ==================== Signed-off-by: David S. Miller <[email protected]>
2014-08-16batman-adv: Fix parameter order of hlist_add_behindSven Eckelmann1-1/+1
1d023284c31a4e40a94d5bbcb7dbb7a35ee0bcbc ("list: fix order of arguments for hlist_add_after(_rcu)") was incorrectly rebased on top of d9124268d84a836f14a6ead54ff9d8eee4c43be5 ("batman-adv: Fix out-of-order fragmentation support"). The parameter order change of the rebased patch was not re-applied as expected. This causes a memory leak and can cause crashes when out-of-order packets are received. hlist_add_behind will try to access the uninitalized list pointers of frag_entry_new to find the previous/next entry and may modify/read random memory locations. Signed-off-by: Sven Eckelmann <[email protected]> Cc: Andrew Morton <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2014-08-16Merge branch 'bcm7xxx'David S. Miller2-22/+21
Florian Fainelli says: ==================== net: phy: bcm7xxx internal PHY fixes Here are 3 small fixes for the Broadcom BCM7xxx internal PHY targeting suspend/resume issues. ==================== Signed-off-by: David S. Miller <[email protected]>
2014-08-16net: phy: bcm7xxx: remove suspend callback for 28nm PHYsFlorian Fainelli1-4/+1
BCM7xxx internal Gigabit PHY on 28nm process do not need anything special to be done during suspend, remove the suspend callback since it might be harmful rather than useful. While at it, update the comment above bcm7xxx_suspend() to reflect that it applies only to 40nm and 65nm process PHY devices. Fixes: b560a58c45c6 ("net: phy: add Broadcom BCM7xxx internal PHY driver") Signed-off-by: Florian Fainelli <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2014-08-16net: phy: bcm7xxx: re-advertise all supported modes out of suspendFlorian Fainelli1-3/+20
The BCM7xxx internal Gigabit PHYs on 28nm process platforms come out reset without any half-duplex or "hub" compatible advertised modes, which was causing auto-negotiation issues coming out of S3 suspend/resume, we just could not establish a link with a half-duplex only link partner. Make sure that the resume function properly re-configures the PHY device to advertise all supported modes. Fixes: b560a58c45c6 ("net: phy: add Broadcom BCM7xxx internal PHY driver") Signed-off-by: Florian Fainelli <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2014-08-16net: phy: bcm7xxx: remove 28nm wildcard entryFlorian Fainelli2-15/+0
A wildcard entry with the 32-bits OUI 0x600d8400 was added as part of the BCM7xxx internal PHY driver, but that entry might match other PHYs that are not covered by this driver, so let's just remove it. Fixes: b560a58c45c6 ("net: phy: add Broadcom BCM7xxx internal PHY driver") Signed-off-by: Florian Fainelli <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2014-08-16Linux 3.17-rc1Linus Torvalds1-2/+2
2014-08-16Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86Linus Torvalds24-108/+608
Pull x86 platform driver updates from Matthew Garrett: "A moderate number of changes, but nothing awfully significant. A lot of const cleanups, some reworking and additions to the rfkill quirks in the asus driver, a new driver for generating falling laptop events on Toshibas and some misc fixes. Maybe vendors have stopped inventing things" * 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86: (41 commits) platform/x86: Enable build support for toshiba_haps Documentation: Add file about toshiba_haps module platform/x86: Toshiba HDD Active Protection Sensor asus-nb-wmi: Add wapf4 quirk for the U32U alienware-wmi: make hdmi_mux enabled on case-by-case basis ideapad-laptop: Constify DMI table and other r/o variables asus-nb-wmi.c: Rename x401u quirk to wapf4 compal-laptop: correct invalid hwmon name toshiba_acpi: Add Qosmio X75-A to the alt keymap dmi list toshiba_acpi: Add extra check to backlight code Fix log message about future removal of interface ideapad-laptop: Disable touchpad interface on Yoga models asus-nb-wmi: Add wapf4 quirk for the X550CC intel_ips: Make ips_mcp_limits variables static thinkpad_acpi: Mark volume_alsa_control_{vol,mute} as __initdata fujitsu-laptop: Mark fujitsu_dmi_table[] DMI table as __initconst hp-wmi: Add missing __init annotations to initialization code hp_accel: Constify ACPI and DMI tables fujitsu-tablet: Mark DMI callbacks as __init code dell-laptop: Mark dell_quirks[] DMI table as __initconst ...
2014-08-16Merge branch 'release' of ↵Linus Torvalds3-41/+119
git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux Pull idle update from Len Brown: "Two Intel-platform-specific updates to intel_idle, and a cosmetic tweak to the turbostat utility" * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux: tools/power turbostat: tweak whitespace in output format intel_idle: Broadwell support intel_idle: Disable Baytrail Core and Module C6 auto-demotion
2014-08-16Merge tag 'fixes-for-linus' of ↵Linus Torvalds1-0/+5
git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux Pull module fix from Rusty Russell: "Nasty potential bug if someone uses a known module param with an invalid value (we don't fail unknown module params any more, just warn)" * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux: module: Clean up ro/nx after early module load failures
2014-08-16Merge branch 'rng-queue' of ↵Linus Torvalds1-0/+1
git://git.kernel.org/pub/scm/linux/kernel/git/amit/virtio Pull virtio-rng update from Amit Shah: "Add derating factor for use by hwrng core Sending directly to you with the commit log changes Ted Ts'o pointed out. Not sure if Rusty's back after his travel, but this already has his s-o-b" * 'rng-queue' of git://git.kernel.org/pub/scm/linux/kernel/git/amit/virtio: virtio: rng: add derating factor for use by hwrng core
2014-08-16Merge branch 'for-linus2' of ↵Linus Torvalds17-305/+541
git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs Pull btrfs updates from Chris Mason: "These are all fixes I'd like to get out to a broader audience. The biggest of the bunch is Mark's quota fix, which is also in the SUSE kernel, and makes our subvolume quotas dramatically more accurate. I've been running xfstests with these against your current git overnight, but I'm queueing up longer tests as well" * 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: btrfs: disable strict file flushes for renames and truncates Btrfs: fix csum tree corruption, duplicate and outdated checksums Btrfs: Fix memory corruption by ulist_add_merge() on 32bit arch Btrfs: fix compressed write corruption on enospc btrfs: correctly handle return from ulist_add btrfs: qgroup: account shared subtrees during snapshot delete Btrfs: read lock extent buffer while walking backrefs Btrfs: __btrfs_mod_ref should always use no_quota btrfs: adjust statfs calculations according to raid profiles
2014-08-16Merge tag 'locks-v3.17-2' of git://git.samba.org/jlayton/linuxLinus Torvalds2-30/+62
Pull file locking bugfixes from Jeff Layton: "Most of these patches are to fix a long-standing regression that crept in when the BKL was removed from the file-locking code. The code was converted to use a conventional spinlock, but some fl_release_private ops can block and you can end up sleeping inside the lock. There's also a patch to make /proc/locks show delegations as 'DELEG'" * tag 'locks-v3.17-2' of git://git.samba.org/jlayton/linux: locks: update Locking documentation to clarify fl_release_private behavior locks: move locks_free_lock calls in do_fcntl_add_lease outside spinlock locks: defer freeing locks in locks_delete_lock until after i_lock has been dropped locks: don't reuse file_lock in __posix_lock_file locks: don't call locks_release_private from locks_copy_lock locks: show delegations as "DELEG" in /proc/locks
2014-08-16Merge git://git.kvack.org/~bcrl/aio-nextLinus Torvalds1-56/+30
Pull aio updates from Ben LaHaise. * git://git.kvack.org/~bcrl/aio-next: aio: use iovec array rather than the single one aio: fix some comments aio: use the macro rather than the inline magic number aio: remove the needless registration of ring file's private_data aio: remove no longer needed preempt_disable() aio: kill the misleading rcu read locks in ioctx_add_table() and kill_ioctx() aio: change exit_aio() to load mm->ioctx_table once and avoid rcu_read_lock()
2014-08-16platform/x86: Enable build support for toshiba_hapsAzael Avalos2-0/+20
Makefile and Kconfig build support patch for the newly introduced kernel module toshiba_haps. Signed-off-by: Azael Avalos <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2014-08-16Documentation: Add file about toshiba_haps moduleAzael Avalos2-0/+78
This patch provides information about the Toshiba HDD Active Protection Sensor driver module toshiba_haps. Signed-off-by: Azael Avalos <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2014-08-16platform/x86: Toshiba HDD Active Protection SensorAzael Avalos1-0/+265
This driver adds support for the built-in accelereometer found on recent Toshiba laptops with HID TOS620A. This driver receives ACPI notify events 0x80 when the sensor detects a sudden move or a harsh vibration, as well as an ACPI notify event 0x81 whenever the movement or vibration has been stabilized. Also provides sysfs entries to get/set the desired protection level and reseting the HDD protection interface. Signed-off-by: Azael Avalos <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2014-08-16asus-nb-wmi: Add wapf4 quirk for the U32UHans de Goede1-0/+14
As reported here: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1173681 the U32U needs wapf=4 too. Signed-off-by: Hans de Goede <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2014-08-16alienware-wmi: make hdmi_mux enabled on case-by-case basisMario Limonciello1-2/+20
Not all HW supporting WMAX method will support the HDMI mux feature. Explicitly quirk the HW that does support it. Signed-off-by: Mario Limonciello <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2014-08-16ideapad-laptop: Constify DMI table and other r/o variablesMathias Krause1-2/+2
Constify the rfkill_blacklist[] DMI table, the ideapad_rfk_data[] table and the ideapad_attribute_group attribute group. There's no need to have them writeable during runtime. Signed-off-by: Mathias Krause <[email protected]> Cc: Ike Panhc <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2014-08-16asus-nb-wmi.c: Rename x401u quirk to wapf4Hans de Goede1-13/+13
The actual x401u does not use the so named x401u quirk but the x55u quirk. All that the x401u quirk does it setting wapf to 4, so rename it to wapf4 to stop the confusion. Signed-off-by: Hans de Goede <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2014-08-16compal-laptop: correct invalid hwmon nameRoald Frederickx1-1/+1
Change the name of the hwmon interface from "compal-laptop" to "compal". A dash is an invalid character for a hwmon name and caused the call to hwmon_device_register_with_groups() to fail. Signed-off-by: Roald Frederickx <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2014-08-16toshiba_acpi: Add Qosmio X75-A to the alt keymap dmi listAzael Avalos1-0/+7
The Toshiba Qosmio X75-A series models also come with the new keymap layout. This patch adds this model to the alt_keymap_dmi list, along with an extra key found on these models. Signed-off-by: Azael Avalos <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2014-08-16toshiba_acpi: Add extra check to backlight codeAzael Avalos1-4/+17
Some Toshiba models (most notably Qosmios) come with an incomplete backlight method where the AML code doesn't check for write or read commands and always returns HCI_SUCCESS and the actual brightness (and in some cases the max brightness), thus allowing the backlight interface to be registered without write support. This patch changes the set_lcd_brightness function, checking the returned values for values greater than zero to avoid registering a broken backlight interface. Signed-off-by: Azael Avalos <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2014-08-16Fix log message about future removal of interfaceMartin Kepplinger1-3/+3
If this is going away, it won't be in 2012. Signed-off-by: Martin Kepplinger <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2014-08-16ideapad-laptop: Disable touchpad interface on Yoga modelsHans de Goede1-0/+27
Yoga models don't offer touchpad ctrl through the ideapad interface, causing ideapad_sync_touchpad_state to send wrong touchpad enable/disable events. Signed-off-by: Hans de Goede <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2014-08-16asus-nb-wmi: Add wapf4 quirk for the X550CCHans de Goede1-0/+9
As reported here: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1173681 the X550CC needs wapf=4 too. Signed-off-by: Hans de Goede <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2014-08-16intel_ips: Make ips_mcp_limits variables staticMathias Krause1-3/+3
These variables don't need to be visible outside of this compilation unit, make them static. Signed-off-by: Mathias Krause <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2014-08-16thinkpad_acpi: Mark volume_alsa_control_{vol,mute} as __initdataMathias Krause1-2/+2
Mark volume_alsa_control_vol and volume_alsa_control_mute as __initdata, as snd_ctl_new1() will copy the relevant parts, so there is no need to keep the master copies around after initialization. Signed-off-by: Mathias Krause <[email protected]> Cc: Henrique de Moraes Holschuh <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2014-08-16fujitsu-laptop: Mark fujitsu_dmi_table[] DMI table as __initconstMathias Krause1-5/+5
The DMI table is only ever used during initialization. Mark it as __initconst so its memory can be released afterwards -- roughly 1.5 kB. In turn, the callback functions can be marked with __init, too. Signed-off-by: Mathias Krause <[email protected]> Cc: Jonathan Woithe <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2014-08-16hp-wmi: Add missing __init annotations to initialization codeMathias Krause1-3/+3
These functions are only called from other initialization routines, so can be marked __init, too. Signed-off-by: Mathias Krause <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2014-08-16hp_accel: Constify ACPI and DMI tablesMathias Krause1-2/+2
Constify the lis3lv02d_device_ids[] ACPI and the lis3lv02d_dmi_ids[] DMI tables. There's no need to have them writeable during runtime. Signed-off-by: Mathias Krause <[email protected]> Cc: Eric Piel <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2014-08-16fujitsu-tablet: Mark DMI callbacks as __init codeMathias Krause1-3/+3
The DMI table is already marked as __initconst, so can be the callback functions as they're only used in that context. Signed-off-by: Mathias Krause <[email protected]> Cc: Robert Gerlach <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2014-08-16dell-laptop: Mark dell_quirks[] DMI table as __initconstMathias Krause1-3/+3
The dell_quirks[] DMI table is only ever used during initialization. Mark it as __initconst so its memory can be released afterwards -- roughly 5.7 kB. In turn, the callback function can be marked with __init, too. Also the touchpad_led_init() function can be marked __init as it's only referenced from dell_init() -- an __init function. Signed-off-by: Mathias Krause <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2014-08-16eeepc-wmi: Constify asus_quirks[] DMI tableMathias Krause1-1/+1
Constify the asus_quirks[] DMI table. There's no need to have it writeable during runtime. Signed-off-by: Mathias Krause <[email protected]> Cc: Corentin Chary <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2014-08-16acer-wmi: Mark init data and code as suchMathias Krause1-20/+21
Quite a lot of code and data of acer-wmi.c is only ever used during initialization. Mark those accordingly -- and constify, where appropriate -- so the memory can be released afterwards. All in all those changes move ~10 kB of code and data to the .init sections, marking them for release after initialization has finished. Signed-off-by: Mathias Krause <[email protected]> Cc: "Lee, Chun-Yi" <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2014-08-16asus-nb-wmi: Constify asus_quirks[] DMI tableMathias Krause1-1/+1
Constify the asus_quirks[] DMI table. There's no need to have it writeable during runtime. Signed-off-by: Mathias Krause <[email protected]> Cc: Corentin Chary <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2014-08-16alienware-wmi: Mark DMI table as __initconstMathias Krause1-2/+2
The DMI table is only ever used during initialization. Mark it as __initconst so its memory can be released appropriately. In turn, the callback function can be marked with __init, too. Signed-off-by: Mathias Krause <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2014-08-16acer-wmi: Hide acer_{suspend,resume} for !CONFIG_PM_SLEEPMathias Krause1-0/+5
Encapsulate acer_suspend() and acer_resume with #ifdef CONFIG_PM_SLEEP to get rid of the following warnings: ../acer-wmi.c:2046:12: warning: ‘acer_suspend’ defined but not used [-Wunused-function] ../acer-wmi.c:2068:12: warning: ‘acer_resume’ defined but not used [-Wunused-function] Signed-off-by: Mathias Krause <[email protected]> Cc: "Lee, Chun-Yi" <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2014-08-16acer-wmi: Mark acer_wmi_keymap[] as __initconstMathias Krause1-1/+1
sparse_keymap_setup() will make a copy of the keymap, so we can release the master copy after initialization. Signed-off-by: Mathias Krause <[email protected]> Cc: "Lee, Chun-Yi" <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>