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

Commit de6f7210 authored by Nick Pelly's avatar Nick Pelly Committed by Dmitry Shmidt
Browse files

ANDROID: rfkill: Introduce CONFIG_RFKILL_PM and use instead of CONFIG_PM to power down 



Some platforms do not want to power down rfkill devices on suspend.

Change-Id: I62a11630521c636d54a4a02ab9037a43435925f5
Signed-off-by: default avatarNick Pelly <npelly@google.com>
parent 3fc1c613

net/rfkill/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -10,6 +10,11 @@ menuconfig RFKILL 
	  To compile this driver as a module, choose M here: the

	  module will be called rfkill.



config RFKILL_PM

	bool "Power off on suspend"

	depends on RFKILL && PM

	default y



# LED trigger support

config RFKILL_LEDS

	bool

net/rfkill/core.c

+3 −1
Original line number Diff line number Diff line
@@ -796,7 +796,7 @@ void rfkill_resume_polling(struct rfkill *rfkill) 
}

EXPORT_SYMBOL(rfkill_resume_polling);



#ifdef CONFIG_PM_SLEEP

#ifdef CONFIG_RFKILL_PM

static int rfkill_suspend(struct device *dev)

{

	struct rfkill *rfkill = to_rfkill(dev);
@@ -837,7 +837,9 @@ static struct class rfkill_class = { 
	.dev_release	= rfkill_release,

	.dev_groups	= rfkill_dev_groups,

	.dev_uevent	= rfkill_dev_uevent,

#ifdef CONFIG_RFKILL_PM

	.pm		= RFKILL_PM_OPS,

#endif

};



bool rfkill_blocked(struct rfkill *rfkill)