openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

sony-laptop: ignore hard switch rfkill events (SPIC) 

There is not much use for these events in userspace and handling the
events themselves seems to get in the way of the actual activation of
the rf devices. The SNC device doesn't expose them already.
https://bugzilla.kernel.org/show_bug.cgi?id=15303

Signed-off-by: Mattia Dongili <malattia@linux.it>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
This commit is contained in:
Mattia Dongili 2011-02-19 11:52:27 +09:00 committed by Matthew Garrett
parent 54286fd0da
commit 4eeb50220a
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/platform/x86/sony-laptop.c
View File

@ -1592,8 +1592,8 @@ static struct sonypi_event sonypi_blueev[] = {
/* The set of possible wireless events */ /* The set of possible wireless events */
static struct sonypi_event sonypi_wlessev[] = { static struct sonypi_event sonypi_wlessev[] = {
{ 0x59, SONYPI_EVENT_WIRELESS_ON }, { 0x59, SONYPI_EVENT_IGNORE },
{ 0x5a, SONYPI_EVENT_WIRELESS_OFF }, { 0x5a, SONYPI_EVENT_IGNORE },
{ 0, 0 } { 0, 0 }
}; };
@ -2733,6 +2733,9 @@ static irqreturn_t sony_pic_irq(int irq, void *dev_id)
if (ev == dev->event_types[i].events[j].data) { if (ev == dev->event_types[i].events[j].data) {
device_event = device_event =
dev->event_types[i].events[j].event; dev->event_types[i].events[j].event;
/* some events may require ignoring */
if (!device_event)
return IRQ_HANDLED;
goto found; goto found;
} }
} }
@ -2752,7 +2755,6 @@ static irqreturn_t sony_pic_irq(int irq, void *dev_id)
sony_laptop_report_input_event(device_event); sony_laptop_report_input_event(device_event);
acpi_bus_generate_proc_event(dev->acpi_dev, 1, device_event); acpi_bus_generate_proc_event(dev->acpi_dev, 1, device_event);
sonypi_compat_report_event(device_event); sonypi_compat_report_event(device_event);
return IRQ_HANDLED; return IRQ_HANDLED;
} }

1
include/linux/sonypi.h
View File

@ -40,6 +40,7 @@
/* events the user application reading /dev/sonypi can use */ /* events the user application reading /dev/sonypi can use */
#define SONYPI_EVENT_IGNORE 0
#define SONYPI_EVENT_JOGDIAL_DOWN 1 #define SONYPI_EVENT_JOGDIAL_DOWN 1
#define SONYPI_EVENT_JOGDIAL_UP 2 #define SONYPI_EVENT_JOGDIAL_UP 2
#define SONYPI_EVENT_JOGDIAL_DOWN_PRESSED 3 #define SONYPI_EVENT_JOGDIAL_DOWN_PRESSED 3