aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/firmware_class/README3
-rw-r--r--drivers/base/firmware_class.c5
2 files changed, 5 insertions, 3 deletions
diff --git a/Documentation/firmware_class/README b/Documentation/firmware_class/README
index c3480aa66ba8..7eceaff63f5f 100644
--- a/Documentation/firmware_class/README
+++ b/Documentation/firmware_class/README
@@ -77,7 +77,8 @@
77 seconds for the whole load operation. 77 seconds for the whole load operation.
78 78
79 - request_firmware_nowait() is also provided for convenience in 79 - request_firmware_nowait() is also provided for convenience in
80 non-user contexts. 80 user contexts to request firmware asynchronously, but can't be called
81 in atomic contexts.
81 82
82 83
83 about in-kernel persistence: 84 about in-kernel persistence:
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 2d296b7f7034..242770250584 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -617,8 +617,9 @@ request_firmware_work_func(void *arg)
617 * @cont: function will be called asynchronously when the firmware 617 * @cont: function will be called asynchronously when the firmware
618 * request is over. 618 * request is over.
619 * 619 *
620 * Asynchronous variant of request_firmware() for contexts where 620 * Asynchronous variant of request_firmware() for user contexts where
621 * it is not possible to sleep. 621 * it is not possible to sleep for long time. It can't be called
622 * in atomic contexts.
622 **/ 623 **/
623int 624int
624request_firmware_nowait( 625request_firmware_nowait(