diff options
| author | Colin Cross <ccross@android.com> | 2011-10-27 15:01:42 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-10-27 15:01:42 -0700 |
| commit | bc2e7067af4c1cd074aaec71c2982e2265f7f169 (patch) | |
| tree | bc8bcb97155bada3d09c91c6b8aa56ed546471a9 /drivers/base | |
| parent | 4e9ff24781ab987120e792a667ba45b3d3dd51a0 (diff) | |
| parent | 97596c34030ed28657ccafddb67e17a03890b90a (diff) | |
| download | kernel_samsung_espresso10-bc2e7067af4c1cd074aaec71c2982e2265f7f169.zip kernel_samsung_espresso10-bc2e7067af4c1cd074aaec71c2982e2265f7f169.tar.gz kernel_samsung_espresso10-bc2e7067af4c1cd074aaec71c2982e2265f7f169.tar.bz2 | |
Merge commit 'v3.0.8' into linux-omap-3.0
Conflicts:
drivers/tty/serial/omap-serial.c
drivers/usb/musb/musb_gadget.c
sound/soc/omap/omap-mcbsp.c
Change-Id: Ic31b7266dda3ac8483f737272874ebf4725b5fe3
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/firmware_class.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c index bbb03e6..06ed6b4 100644 --- a/drivers/base/firmware_class.c +++ b/drivers/base/firmware_class.c @@ -521,11 +521,6 @@ static int _request_firmware(const struct firmware **firmware_p, if (!firmware_p) return -EINVAL; - if (WARN_ON(usermodehelper_is_disabled())) { - dev_err(device, "firmware: %s will not be loaded\n", name); - return -EBUSY; - } - *firmware_p = firmware = kzalloc(sizeof(*firmware), GFP_KERNEL); if (!firmware) { dev_err(device, "%s: kmalloc(struct firmware) failed\n", @@ -539,6 +534,12 @@ static int _request_firmware(const struct firmware **firmware_p, return 0; } + if (WARN_ON(usermodehelper_is_disabled())) { + dev_err(device, "firmware: %s will not be loaded\n", name); + retval = -EBUSY; + goto out; + } + if (uevent) dev_dbg(device, "firmware: requesting %s\n", name); |