firmware_class: Rework usermodehelper check
authorRafael J. Wysocki <rjw@sisk.pl>
Wed, 28 Mar 2012 21:29:45 +0000 (23:29 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Wed, 28 Mar 2012 21:29:45 +0000 (23:29 +0200)
commitfe2e39d8782d885755139304d8dba0b3e5bfa878
tree200fb998fe94b9ccd93d07c59656b8f5ab62c5d7
parent9a4768d849d28a79566aa37de19b9852d2da8ec4
firmware_class: Rework usermodehelper check

Instead of two functions, read_lock_usermodehelper() and
usermodehelper_is_disabled(), used in combination, introduce
usermodehelper_read_trylock() that will only return with umhelper_sem
held if usermodehelper_disabled is unset (and will return -EAGAIN
otherwise) and make _request_firmware() use it.

Rename read_unlock_usermodehelper() to
usermodehelper_read_unlock() to follow the naming convention of the
new function.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: stable@vger.kernel.org
drivers/base/firmware_class.c
include/linux/kmod.h
kernel/kmod.c