aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-05-27Merge branch 'for-linus' of ↵Linus Torvalds27-150/+3161
git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6: (42 commits) regulator: Fix _regulator_get_voltage if get_voltage callback is NULL USB: TWL6025 allow different regulator name REGULATOR: TWL6025: add support to twl-regulator regulator: twl6030: do not write to _GRP for regulator disable regulator: twl6030: do not write to _GRP for regulator enable TPS65911: Comparator: Add comparator driver TPS65911: Add support for added GPIO lines GPIO: TPS65910: Move driver to drivers/gpio/ TPS65911: Add new irq definitions regulator: tps65911: Add new chip version MFD: TPS65910: Add support for TPS65911 device regulator: Fix off-by-one value range checking for mc13xxx_regulator_get_voltage regulator: mc13892: Fix voltage unit in test case. regulator: Remove MAX8997_REG_BUCK1DVS/MAX8997_REG_BUCK2DVS/MAX8997_REG_BUCK5DVS macros mfd: Fix off-by-one value range checking for tps65910_i2c_write regulator: Only apply voltage constraints from consumers that set them regulator: If we can't configure optimum mode we're always in the best one regulator: max8997: remove useless code regulator: Fix memory leak in max8998_pmic_probe failure path regulator: Fix desc_id for tps65023/6507x/65910 ...
2011-05-27Merge git://git.infradead.org/battery-2.6Linus Torvalds12-24/+840
* git://git.infradead.org/battery-2.6: PXA: Use dev_pm_ops in z2_battery ds2760_battery: Fix rated capacity of the hx4700 1800mAh battery ds2760_battery: Fix indexing of the 4 active full EEPROM registers power: Make test_power driver more dynamic. bq27x00_battery: Name of cycle count property max8903_charger: Add GENERIC_HARDIRQS as a dependency (fixes S390 build) ARM: RX-51: Enable isp1704 power on/off isp1704_charger: Allow board specific powering routine gpio-charger: Add gpio_charger_resume power_supply: Add driver for MAX8903 charger
2011-05-27Merge branch 'hwmon-for-linus' of ↵Linus Torvalds2-7/+10
git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging: hwmon: (coretemp) Fix section mismatch hwmon: (pmbus) Initialize sysfs attributes hwmon: (coretemp) Update comments describing the handling of HT CPUs hwmon: (coretemp) Initialize sysfs attributes
2011-05-27Merge branch 'for-linus' of ↵Linus Torvalds27-284/+432
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (26 commits) ASoC: Fix power down for widgetless per-card DAPM context case ASoC: wm1250-ev1: Define "WM1250 Output" with SND_SOC_DAPM_OUTPUT ASoC: Remove duplicate linux/delay.h inclusion. ASoC: sam9g20_wm8731: use the proper SYSCKL value ASoC: wm8731: fix wm8731_check_osc() connected condition ALSA: hda - Reorganize controller quriks with bit flags ALSA: hda - Use snd_printd() in snd_hda_parse_pin_def_config() ALSA: core: remove unused variables. ALSA: HDA: Increase MAX_HDMI_PINS ALSA: PCM - Don't check DMA time-out too shortly MAINTAINERS: add FireWire audio maintainer ALSA: usb-audio: more control quirks for M-Audio FastTrack devices ALSA: usb-audio: add new quirk type QUIRK_AUDIO_STANDARD_MIXER ALSA: usb-audio: export snd_usb_feature_unit_ctl ALSA: usb-audio: rework add_control_to_empty() ALSA: usb-audio: move assignment of chip->ctrl_intf ALSA: hda - Use model=auto for Lenovo G555 ALSA: HDA: Unify HDMI hotplug handling. ALSA: hda - Force AD1988_6STACK_DIG for Asus M3N-HT Deluxe ASoC: core - remove superfluous new line. ...
2011-05-27atm: expose ATM device index in sysfsDan Williams1-0/+10
It's currently exposed only through /proc which, besides requiring screen-scraping, doesn't allow userspace to distinguish between two identical ATM adapters with different ATM indexes. The ATM device index is required when using PPPoATM on a system with multiple ATM adapters. Signed-off-by: Dan Williams <[email protected]> Reviewed-by: Eric Dumazet <[email protected]> Tested-by: David Woodhouse <[email protected]> Cc: [email protected] Signed-off-by: David S. Miller <[email protected]>
2011-05-27Merge branch 'pablo/nf-2.6-updates' of git://1984.lsi.us.es/net-2.6David S. Miller6-22/+38
2011-05-27MAINTAINERS: Update eCryptfs mailing listTyler Hicks1-1/+1
The eCryptfs mailing list has moved from lists.launchpad.net to vger.kernel.org. Signed-off-by: Tyler Hicks <[email protected]>
2011-05-27eCryptfs: Allow 2 scatterlist entries for encrypted filenamesTyler Hicks1-25/+21
The buffers allocated while encrypting and decrypting long filenames can sometimes straddle two pages. In this situation, virt_to_scatterlist() will return -ENOMEM, causing the operation to fail and the user will get scary error messages in their logs: kernel: ecryptfs_write_tag_70_packet: Internal error whilst attempting to convert filename memory to scatterlist; expected rc = 1; got rc = [-12]. block_aligned_filename_size = [272] kernel: ecryptfs_encrypt_filename: Error attempting to generate tag 70 packet; rc = [-12] kernel: ecryptfs_encrypt_and_encode_filename: Error attempting to encrypt filename; rc = [-12] kernel: ecryptfs_lookup: Error attempting to encrypt and encode filename; rc = [-12] The solution is to allow up to 2 scatterlist entries to be used. Signed-off-by: Tyler Hicks <[email protected]> Cc: <[email protected]>
2011-05-27eCryptfs: Clear i_nlink in rmdirTyler Hicks1-0/+2
eCryptfs wasn't clearing the eCryptfs inode's i_nlink after a successful vfs_rmdir() on the lower directory. This resulted in the inode evict and destroy paths to be missed. https://bugs.launchpad.net/ecryptfs/+bug/723518 Signed-off-by: Tyler Hicks <[email protected]> Cc: <[email protected]>
2011-05-27acer-wmi: support integer return type from WMI methodsLee, Chun-Yi1-0/+6
Acer WMID_GUID1/2 method's return value was declared to integer type on Gateway notebook. So, add this patch for support integer return type. Reference: bko#33032 https://bugzilla.kernel.org/show_bug.cgi?id=33032 Tested on Gateway NV5909H laptop Tested-by: Filipus Klutiero <[email protected]> Cc: Carlos Corbacho <[email protected]> Cc: Matthew Garrett <[email protected]> Cc: Dmitry Torokhov <[email protected]> Cc: Corentin Chary <[email protected]> Cc: Thomas Renninger <[email protected]> Signed-off-by: Lee, Chun-Yi <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2011-05-27msi-laptop: fix section mismatch in reference from the function ↵Lee, Chun-Yi1-1/+1
load_scm_model_init There have section mismatch warning message shows up when building the kernel with make CONFIG_DEBUG_SECTION_MISMATCH=y. The problem is the load_scm_model_init() calls msi_laptop_input_setup() which is an __init function, but load_scm_model_init() lacks a __init annotation. This patch add __init on load_scm_model_init() to avoid warning message. Cc: Matthew Garrett <[email protected]> Cc: Dmitry Torokhov <[email protected]> Cc: Corentin Chary <[email protected]> Cc: Thomas Renninger <[email protected]> Signed-off-by: Lee, Chun-Yi <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2011-05-27acer-wmi: support to set communication device state by new wmid methodLee, Chun-Yi1-1/+110
Have many Acer notebooks' BIOS already support new WMID_GUID3 method. On those machines, that will be better set communication device by evaluate WMID_GUID3 method. Tested on Acer Travelmate 8572 Cc: Carlos Corbacho <[email protected]> Cc: Matthew Garrett <[email protected]> Cc: Dmitry Torokhov <[email protected]> Cc: Corentin Chary <[email protected]> Cc: Thomas Renninger <[email protected]> Signed-off-by: Lee, Chun-Yi <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2011-05-27acer-wmi: allow 64-bits return buffer from WMI methodsLee, Chun-Yi1-3/+6
Acer WMID_GUID1/2 method's return buffer was declared to 64-bits on some Acer notebook, but WMI method only use 32-bits in return buffer. So, add this patch for allow 64-bits return buffer. Reference: bko#34142 https://bugzilla.kernel.org/show_bug.cgi?id=34142 Tested on Acer Travelmate 5735Z-452G32Mnss Tested-by: Melchior FRANZ <[email protected]> Cc: Carlos Corbacho <[email protected]> Cc: Matthew Garrett <[email protected]> Cc: Dmitry Torokhov <[email protected]> Cc: Corentin Chary <[email protected]> Cc: Thomas Renninger <[email protected]> Signed-off-by: Lee, Chun-Yi <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2011-05-27acer-wmi: check the existence of internal 3G device when set capabilityLee, Chun-Yi1-1/+2
That will be better to check the existence of internal 3G device when we set threeg capability and generate killswitch for threeg. It can avoid userland access 3G rfkill but the machine doesn't have internal 3G device. Reference: bko#32862 https://bugzilla.kernel.org/show_bug.cgi?id=32862 Tested on Acer Aspire 8930G, Acer Travelmate 8572 Tested-by: Hector Martin <[email protected]> Cc: Carlos Corbacho <[email protected]> Cc: Matthew Garrett <[email protected]> Cc: Dmitry Torokhov <[email protected]> Cc: Corentin Chary <[email protected]> Cc: Thomas Renninger <[email protected]> Signed-off-by: Lee, Chun-Yi <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2011-05-27platform/x86:delete two unused variablesWeiping Pan1-2/+0
variable handle is not used in these two functions, just delete them. Signed-off-by: Weiping Pan <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2011-05-27support wlan hotkey on Acer Travelmate 5735ZMelchior FRANZ1-1/+14
On an Acer Travelmate 5735Z-452G32Mnss the WLAN-enable/disable key doesn't send 0x1 as acpi event key code, but 0x3. This patch also makes the module ignore hotkey acpi events for functions that are already handled without. This avoids warning message "keyboard: can't emulate rawmode for keycode 240". Signed-off-by: Melchior FRANZ <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2011-05-27platform-x86: intel_mid_thermal: Fix memory leakAmeya Palande1-0/+1
Signed-off-by: Ameya Palande <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2011-05-27platform/x86: Fix Makefile for intel_mid_powerbtnAmeya Palande1-1/+1
Signed-off-by: Ameya Palande <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2011-05-27platform/x86: Simplify intel_mid_powerbtnAmeya Palande1-42/+30
This patch: 1. Removes unnecessay #defines 2. Removes 'mfld_pb_priv' data structure which results in simpler error handling and less memory allocations. Signed-off-by: Ameya Palande <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2011-05-27acer-wmi: Delete out-of-date documentationCarlos Corbacho1-184/+0
The documentation file for acer-wmi is long out of date, and there's not much point in keeping it around either. Signed-off-by: Carlos Corbacho <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2011-05-27acerhdf: Clean up includesJean Delvare1-3/+1
* The acerhdf driver isn't an ACPI driver, so it needs not include <acpi/acpi_drivers.h>. All it uses is ec_read() and ec_write(), for which <linux/acpi.h> is sufficient. * I couldn't find any reason why <linux/fs.h> and <linux/sched.h> were included. This should avoid unneeded rebuilds of the acerhdf driver. Signed-off-by: Jean Delvare <[email protected]> Cc: Peter Feuerer <[email protected]> Cc: Matthew Garrett <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2011-05-27acerhdf: Drop pointless dependency on THERMAL_HWMONJean Delvare1-1/+1
The THERMAL_HWMON config option simply exposes the thermal zone temperature values and limits to user-space. It makes no sense for a kernel driver to depend on this. Signed-off-by: Jean Delvare <[email protected]> Cc: Peter Feuerer <[email protected]> Cc: Matthew Garrett <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2011-05-27acer-wmi: Update MAINTAINERSCarlos Corbacho1-3/+1
I don't have the time or much interest these days in maintaining acer-wmi, as I don't have access to newer Acer hardware. As he's been doing most of the work these days anyway, Joey Lee has kindly agreed to take over. Signed-off-by: Carlos Corbacho <[email protected]> Cc: Joey Lee <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2011-05-27wmi: Orphan ACPI-WMI driverCarlos Corbacho1-3/+1
I no longer have the time to work on this, and haven't really been doing any work to this either. Time to let someone else take the reins. Signed-off-by: Carlos Corbacho <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2011-05-27tc1100-wmi: Orphan driverCarlos Corbacho1-2/+1
I've never owned the hardware, this was a port of an existing driver to prove that the ACPI-WMI code was useful to more than just acer-wmi. Signed-off-by: Carlos Corbacho <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2011-05-27acer-wmi: does not allow negative number set to initial device stateLee, Chun-Yi1-3/+5
The driver set module parameter value: mailled, threeg and brightness to BIOS by evaluate wmi method when driver was initialed. The default values for those parameters are -1, so, that will be better don't set negative value to BIOS. Cc: Carlos Corbacho <[email protected]> Cc: Matthew Garrett <[email protected]> Cc: Dmitry Torokhov <[email protected]> Cc: Corentin Chary <[email protected]> Signed-off-by: Lee, Chun-Yi <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2011-05-27platform/oaktrail: ACPI EC Extra driver for OaktrailYin Kangkai3-0/+406
This driver implements an Extra ACPI EC driver for products based on Intel Oaktrail platform. This driver does below things: 1. registers itself in the Linux backlight control in /sys/class/backlight/intel_oaktrail/ 2. registers in the rfkill subsystem here: /sys/class/rfkill/rfkillX/ for these components: wifi, bluetooth, wwan (3g), gps Signed-off-by: Yin Kangkai <[email protected]> [Extracted from a bigger patch by Yin Kangkai, this version leaves out some sysfs bits that probably want to be driver managed, and ACPI i2c enumeration] Signed-off-by: Alan Cox <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2011-05-27thinkpad_acpi: Convert printks to pr_<level>Joe Perches1-284/+188
Add pr_fmt. Removed local TPACPI_<level> #defines, convert to pr_<level>. Neaten dbg_<foo> macros. Added a few missing newlines to logging messages. Added static inline str_supported for !CONFIG_THINKPAD_ACPI_DEBUG vdbg_printk defect reported by Sedat Dilek <[email protected]>. Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2011-05-27thinkpad_acpi: Correct !CONFIG_THINKPAD_ACPI_VIDEO warningJoe Perches1-9/+9
Move TPACPI_HANDLE declaration into #ifdef block and neaten it a bit. Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2011-05-27platform-x86: intel_mid_thermal: Fix coding styleAmeya Palande1-306/+300
Before fixing checkpatch.pl reported 74 errors and 234 warnings Signed-off-by: Ameya Palande <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2011-05-27xo15-ebook: Use pr_<level>Joe Perches1-2/+3
Use the current logging styles. Remove local #define PREFIX. Add pr_fmt. Convert printk to pr_<level>. Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2011-05-27wmi: Removed trailing whitespace from logging message.Joe Perches1-5/+5
Just neatening. Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2011-05-27toshiba: Convert printks to pr_<level>Joe Perches2-36/+34
Add pr_fmt. Remove local MY_<foo> #defines. Convert printks to pr_<level>. Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2011-05-27topstar-laptop: Convert remaining printk to pr_infoJoe Perches1-1/+1
To be similar to all other uses. Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2011-05-27tc1100-wmi: Add pr_fmt, use pr_<level>Joe Perches1-4/+3
Use the more normal logging styles. Removed now unused local logging #defines. Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2011-05-27sony-laptop: Add and use #define pr_fmtJoe Perches1-55/+49
Add pr_fmt. Remove now unused #define DRV_PRX. Neaten dprintk macro. Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2011-05-27msi-wmi: Use pr_fmt and pr_<level>Joe Perches1-25/+20
Added pr_fmt. Removed now unused #define DRV_PFX Convert dprintk to pr_debug. Convert printks to pr_<level>. Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2011-05-27msi-laptop: pr_<level> neateningJoe Perches1-5/+4
Just making it a bit more like other logging message uses. Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2011-05-27intel_pmic_gpio: Convert printks to pr_<level>Joe Perches1-7/+7
Add #define pr_fmt(fmt) "%s: " fmt, __func__ to prefix function name to each output message. Convert printks to pr_<level>. Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2011-05-27intel_menlow: Add pr_fmt and use pr_<level>Joe Perches1-2/+3
Add pr_fmt to prefix the logging messages. Convert printk to pr_<level>. Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2011-05-27ideapad-laptop: Add pr_fmtJoe Perches1-0/+2
Add pr_fmt to prefix logging messages. Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2011-05-27ibm_rtl: Use pr_fmt and pr_<level>Joe Perches1-8/+11
Remove hard coded prefixes from logging messages. Neaten RTL_DEBUG macro and uses. Convert __FUNCTION__ to __func__. Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2011-05-27hp-wmi: Convert printks to pr_<level>Joe Perches1-26/+17
Added pr_fmt and converted printks to pr_<level>. Removed now unused PREFIX and UNIMPL #defines. Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2011-05-27hdaps: Convert printks to pr_<level>Joe Perches1-9/+10
Added pr_fmt, converted printks and removed hard coded prefixes. Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2011-05-27fujitsu-laptop: Convert printks to pr_<level>Joe Perches1-20/+19
Added pr_fmt, converted printks and removed hard coded prefixes. Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2011-05-27eeepc: Use pr_warnJoe Perches2-17/+18
Just a trivial pr_warning to pr_warn conversion while adding a few missing newlines. Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2011-05-27dell: Convert printks to pr_<level>Joe Perches3-16/+16
Add pr_fmt. Remove hard coded prefixes and use pr_<level>. Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2011-05-27compal-laptop: Convert printks to pr_<level>Joe Perches1-13/+9
Add pr_fmt. Convert printks to pr_<level> removing DRIVER_NAME prefix. Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2011-05-27asus: Add pr_fmt and convert printks to pr_<level>Joe Perches3-72/+59
Add pr_fmt, prefixes each log message. Convert printks to pr_<level>. Convert pr_warning to pr_warn. Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2011-05-27acer-wmi: pr_<level> cleanupsJoe Perches1-16/+16
Convert pr_warning to pr_warn. Add some missing newlines to pr_<level> uses. Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.