Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4eeb5022 authored by Mattia Dongili's avatar Mattia Dongili Committed by Matthew Garrett
Browse files

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: default avatarMattia Dongili <malattia@linux.it>
Signed-off-by: default avatarMatthew Garrett <mjg@redhat.com>
parent 54286fd0

drivers/platform/x86/sony-laptop.c

+5 −3
Original line number Diff line number Diff line
@@ -1592,8 +1592,8 @@ static struct sonypi_event sonypi_blueev[] = { 


/* The set of possible wireless events */

static struct sonypi_event sonypi_wlessev[] = {

	{ 0x59, SONYPI_EVENT_WIRELESS_ON },

	{ 0x5a, SONYPI_EVENT_WIRELESS_OFF },

	{ 0x59, SONYPI_EVENT_IGNORE },

	{ 0x5a, SONYPI_EVENT_IGNORE },

	{ 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) {

				device_event =

					dev->event_types[i].events[j].event;

				/* some events may require ignoring */

				if (!device_event)

					return IRQ_HANDLED;

				goto found;

			}

		}
@@ -2752,7 +2755,6 @@ static irqreturn_t sony_pic_irq(int irq, void *dev_id) 
	sony_laptop_report_input_event(device_event);

	acpi_bus_generate_proc_event(dev->acpi_dev, 1, device_event);

	sonypi_compat_report_event(device_event);



	return IRQ_HANDLED;

}

include/linux/sonypi.h

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 


/* events the user application reading /dev/sonypi can use */



#define SONYPI_EVENT_IGNORE			 0

#define SONYPI_EVENT_JOGDIAL_DOWN		 1

#define SONYPI_EVENT_JOGDIAL_UP			 2

#define SONYPI_EVENT_JOGDIAL_DOWN_PRESSED	 3