Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* '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
This commit is contained in:
@@ -93,6 +93,8 @@ static struct dmi_system_id __initdata mail_led_whitelist[] = {
|
||||
static void clevo_mail_led_set(struct led_classdev *led_cdev,
|
||||
enum led_brightness value)
|
||||
{
|
||||
i8042_lock_chip();
|
||||
|
||||
if (value == LED_OFF)
|
||||
i8042_command(NULL, CLEVO_MAIL_LED_OFF);
|
||||
else if (value <= LED_HALF)
|
||||
@@ -100,6 +102,8 @@ static void clevo_mail_led_set(struct led_classdev *led_cdev,
|
||||
else
|
||||
i8042_command(NULL, CLEVO_MAIL_LED_BLINK_1HZ);
|
||||
|
||||
i8042_unlock_chip();
|
||||
|
||||
}
|
||||
|
||||
static int clevo_mail_led_blink(struct led_classdev *led_cdev,
|
||||
@@ -108,6 +112,8 @@ static int clevo_mail_led_blink(struct led_classdev *led_cdev,
|
||||
{
|
||||
int status = -EINVAL;
|
||||
|
||||
i8042_lock_chip();
|
||||
|
||||
if (*delay_on == 0 /* ms */ && *delay_off == 0 /* ms */) {
|
||||
/* Special case: the leds subsystem requested us to
|
||||
* chose one user friendly blinking of the LED, and
|
||||
@@ -135,6 +141,8 @@ static int clevo_mail_led_blink(struct led_classdev *led_cdev,
|
||||
*delay_on, *delay_off);
|
||||
}
|
||||
|
||||
i8042_unlock_chip();
|
||||
|
||||
return status;
|
||||
}
|
||||
|
||||
|
Fai riferimento in un nuovo problema
Block a user