summaryrefslogtreecommitdiffstats
path: root/include/linux/kmod.h
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2011-05-06 20:09:42 +0200
committerRafael J. Wysocki <rjw@sisk.pl>2011-05-17 23:19:17 +0200
commita144c6a6c924aa1da04dd77fb84b89927354fdff (patch)
tree10cab9080a722a191086f58b9f304329e8a8b942 /include/linux/kmod.h
parente1866b33b1e89f077b7132daae3dfd9a594e9a1a (diff)
downloadlinux-stable-a144c6a6c924aa1da04dd77fb84b89927354fdff.tar.gz
linux-stable-a144c6a6c924aa1da04dd77fb84b89927354fdff.tar.bz2
linux-stable-a144c6a6c924aa1da04dd77fb84b89927354fdff.zip
PM: Print a warning if firmware is requested when tasks are frozen
Some drivers erroneously use request_firmware() from their ->resume() (or ->thaw(), or ->restore()) callbacks, which is not going to work unless the firmware has been built in. This causes system resume to stall until the firmware-loading timeout expires, which makes users think that the resume has failed and reboot their machines unnecessarily. For this reason, make _request_firmware() print a warning and return immediately with error code if it has been called when tasks are frozen and it's impossible to start any new usermode helpers. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Reviewed-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
Diffstat (limited to 'include/linux/kmod.h')
-rw-r--r--include/linux/kmod.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/kmod.h b/include/linux/kmod.h
index 6efd7a78de6a..7f3dbcb78116 100644
--- a/include/linux/kmod.h
+++ b/include/linux/kmod.h
@@ -111,7 +111,12 @@ call_usermodehelper(char *path, char **argv, char **envp, enum umh_wait wait)
extern void usermodehelper_init(void);
+#ifdef CONFIG_PM_SLEEP
extern int usermodehelper_disable(void);
extern void usermodehelper_enable(void);
+extern bool usermodehelper_is_disabled(void);
+#else
+static inline bool usermodehelper_is_disabled(void) { return false; }
+#endif
#endif /* __LINUX_KMOD_H__ */