diff options
| author | Nick Pelly <npelly@google.com> | 2008-12-04 17:37:05 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-06-14 09:09:15 -0700 |
| commit | 261a79980b356d131d8004e5bf507d64c0e7fba1 (patch) | |
| tree | f836d654e4c20745c893d40982e004c81409bb42 | |
| parent | 24087d74f5146ae7dc6b7a84b58fab1e3b90d7a4 (diff) | |
| download | kernel_samsung_aries-261a79980b356d131d8004e5bf507d64c0e7fba1.zip kernel_samsung_aries-261a79980b356d131d8004e5bf507d64c0e7fba1.tar.gz kernel_samsung_aries-261a79980b356d131d8004e5bf507d64c0e7fba1.tar.bz2 | |
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: Nick Pelly <npelly@google.com>
| -rw-r--r-- | net/rfkill/Kconfig | 5 | ||||
| -rw-r--r-- | net/rfkill/core.c | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/net/rfkill/Kconfig b/net/rfkill/Kconfig index 78efe89..8e12c8a 100644 --- a/net/rfkill/Kconfig +++ b/net/rfkill/Kconfig @@ -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 diff --git a/net/rfkill/core.c b/net/rfkill/core.c index be90640..df2dae6 100644 --- a/net/rfkill/core.c +++ b/net/rfkill/core.c @@ -769,6 +769,7 @@ void rfkill_pause_polling(struct rfkill *rfkill) } EXPORT_SYMBOL(rfkill_pause_polling); +#ifdef CONFIG_RFKILL_PM void rfkill_resume_polling(struct rfkill *rfkill) { BUG_ON(!rfkill); @@ -803,14 +804,17 @@ static int rfkill_resume(struct device *dev) return 0; } +#endif static struct class rfkill_class = { .name = "rfkill", .dev_release = rfkill_release, .dev_attrs = rfkill_dev_attrs, .dev_uevent = rfkill_dev_uevent, +#ifdef CONFIG_RFKILL_PM .suspend = rfkill_suspend, .resume = rfkill_resume, +#endif }; bool rfkill_blocked(struct rfkill *rfkill) |