diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org.(none)> | 2005-04-19 16:14:28 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org.(none)> | 2005-04-19 16:14:28 -0400 |
| commit | 9f6c6fc505560465be0964eb4da1b6ca97bd3951 (patch) | |
| tree | 9660991b5e417ad7bb74e105c037ff358f60ba27 /drivers/base/firmware_class.c | |
| parent | c3c661932cd53582c5b03692b99649300977248a (diff) | |
| parent | f0e035f4b6940aae6836500b642029c289ed4535 (diff) | |
Merge with kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6.git/
for 13 driver core, sysfs, and debugfs fixes.
Diffstat (limited to 'drivers/base/firmware_class.c')
| -rw-r--r-- | drivers/base/firmware_class.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c index 26c9464af80a..97fe13f7f07c 100644 --- a/drivers/base/firmware_class.c +++ b/drivers/base/firmware_class.c | |||
| @@ -102,6 +102,9 @@ firmware_class_hotplug(struct class_device *class_dev, char **envp, | |||
| 102 | if (add_hotplug_env_var(envp, num_envp, &i, buffer, buffer_size, &len, | 102 | if (add_hotplug_env_var(envp, num_envp, &i, buffer, buffer_size, &len, |
| 103 | "FIRMWARE=%s", fw_priv->fw_id)) | 103 | "FIRMWARE=%s", fw_priv->fw_id)) |
| 104 | return -ENOMEM; | 104 | return -ENOMEM; |
| 105 | if (add_hotplug_env_var(envp, num_envp, &i, buffer, buffer_size, &len, | ||
| 106 | "TIMEOUT=%i", loading_timeout)) | ||
| 107 | return -ENOMEM; | ||
| 105 | 108 | ||
| 106 | envp[i] = NULL; | 109 | envp[i] = NULL; |
| 107 | 110 | ||