Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03138ef9 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 7e5c4c26 705c0ee8

drivers/bus/hisi_lpc.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -522,10 +522,9 @@ static int hisi_lpc_acpi_probe(struct device *hostdev) 




		if (!found) {

		if (!found) {

			dev_warn(hostdev,

			dev_warn(hostdev,

				 "could not find cell for child device (%s)\n",

				 "could not find cell for child device (%s), discarding\n",

				 hid);

				 hid);

			ret = -ENODEV;

			continue;

			goto fail;

		}

		}





		pdev = platform_device_alloc(cell->name, PLATFORM_DEVID_AUTO);

		pdev = platform_device_alloc(cell->name, PLATFORM_DEVID_AUTO);