summaryrefslogtreecommitdiff
path: root/drivers/bus
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2019-02-15 19:32:11 +0300
committerArnd Bergmann <arnd@arndb.de>2019-02-15 19:32:27 +0300
commit03138ef99132d8cbcc9a5188ef29c606f7cede4e (patch)
treeb4d4c0972bb45841be931380bfe52a196a94b7f2 /drivers/bus
parent7e5c4c26c7feefd3f3d9110744ba0bf6ab41ac2a (diff)
parent705c0ee8d4a64b072e324f8daa8767e92560a892 (diff)
downloadlinux-03138ef99132d8cbcc9a5188ef29c606f7cede4e.tar.xz
Merge tag 'hisi-drivers-for-5.1' of git://github.com/hisilicon/linux-hisi into arm/drivers
ARM64: hisi: SoC driver updates for 5.1 - Add compatibility support for different FWs in the hisi LPC bus driver * tag 'hisi-drivers-for-5.1' of git://github.com/hisilicon/linux-hisi: bus: hisi_lpc: Don't fail probe for unrecognised child devices Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/bus')
-rw-r--r--drivers/bus/hisi_lpc.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/bus/hisi_lpc.c b/drivers/bus/hisi_lpc.c
index d5f85455fa62..19d7b6ff2f17 100644
--- a/drivers/bus/hisi_lpc.c
+++ b/drivers/bus/hisi_lpc.c
@@ -522,10 +522,9 @@ static int hisi_lpc_acpi_probe(struct device *hostdev)
if (!found) {
dev_warn(hostdev,
- "could not find cell for child device (%s)\n",
+ "could not find cell for child device (%s), discarding\n",
hid);
- ret = -ENODEV;
- goto fail;
+ continue;
}
pdev = platform_device_alloc(cell->name, PLATFORM_DEVID_AUTO);