From 3e02b040ad3a9467ecb0af269025f01e08d9abc1 Mon Sep 17 00:00:00 2001 From: Christoph Manszewski Date: Fri, 15 Feb 2019 15:35:26 +0100 Subject: Revert "[LOCAL] base/firmware: return -EPROBE_DEFER until rootfs is available" This reverts commit 1733ede82e9e964a3d5234ef61979ca523e7ba5a. Signed-off-by: Christoph Manszewski Change-Id: I30441cbd9b4933cab7e1cb6e80d767e4fca65f41 --- drivers/base/base.h | 2 ++ drivers/base/firmware_class.c | 7 ------- 2 files changed, 2 insertions(+), 7 deletions(-) (limited to 'drivers') diff --git a/drivers/base/base.h b/drivers/base/base.h index eea838ccec6e..d800de650fa5 100644 --- a/drivers/base/base.h +++ b/drivers/base/base.h @@ -130,6 +130,8 @@ extern void driver_remove_groups(struct device_driver *drv, extern char *make_class_name(const char *name, struct kobject *kobj); extern int devres_release_all(struct device *dev); +extern void device_block_probing(void); +extern void device_unblock_probing(void); /* /sys/devices directory */ extern struct kset *devices_kset; diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c index 05f966ab541c..4b57cf5bc81d 100644 --- a/drivers/base/firmware_class.c +++ b/drivers/base/firmware_class.c @@ -32,7 +32,6 @@ #include #include #include -#include #include @@ -393,9 +392,6 @@ fw_get_filesystem_firmware(struct device *device, struct firmware_buf *buf) enum kernel_read_file_id id = READING_FIRMWARE; size_t msize = INT_MAX; - if (ROOT_DEV == 0) - return -EPROBE_DEFER; - /* Already populated data member means we're loading into a buffer */ if (buf->data) { id = READING_FIRMWARE_PREALLOC_BUFFER; @@ -1405,9 +1401,6 @@ request_firmware_nowait( { struct firmware_work *fw_work; - if (ROOT_DEV == 0) - return -EPROBE_DEFER; - fw_work = kzalloc(sizeof(struct firmware_work), gfp); if (!fw_work) return -ENOMEM; -- cgit v1.2.3