diff options
author | Ming Lei <tom.leiming@gmail.com> | 2009-05-28 23:33:19 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-06-16 00:30:24 -0400 |
commit | 7fcab099795812a8a08eb3b8c8ddb35c3685045f (patch) | |
tree | de2bd852d27ac721e6d40b85e7661d7f438119e0 | |
parent | c4c01684349ac0821ad8c27de9516fe493f3361d (diff) |
driver core: fix documentation of request_firmware_nowait
request_firmware_nowait declares it can be called in non-sleep contexts,
but kthead_run called by request_firmware_nowait may sleep. So fix its
documentation and comment to make callers clear about it.
Signed-off-by: Ming Lei <tom.leiming@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | Documentation/firmware_class/README | 3 | ||||
-rw-r--r-- | drivers/base/firmware_class.c | 5 |
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 | **/ |
623 | int | 624 | int |
624 | request_firmware_nowait( | 625 | request_firmware_nowait( |