diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2020-12-09 00:27:44 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2020-12-09 00:39:59 +0100 |
| commit | 9ccd9ef36fc3552dcd1173d1f73dc19e56cca1f3 (patch) | |
| tree | de5ea15b2e1903e9dff63c185ccf2f4624dcbe82 /drivers/soc | |
| parent | 5dd65cf78dc3be1a48223e83764ccbd14ded99f2 (diff) | |
| parent | c2867b2e710fc85bb39c6f6e5948450c48e8a33e (diff) | |
Merge tag 'v5.11-rockchip-drivers-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/drivers
Minor fixes for the io-domain soc-driver
* tag 'v5.11-rockchip-drivers-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
soc: rockchip: io-domain: Fix error return code in rockchip_iodomain_probe()
soc: rockchip: io-domain: Remove incorrect and incomplete comment header
Link: https://lore.kernel.org/r/2045618.irdbgypaU6@phil
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/rockchip/io-domain.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/soc/rockchip/io-domain.c b/drivers/soc/rockchip/io-domain.c index eece97f97ef8..cf8182fc3642 100644 --- a/drivers/soc/rockchip/io-domain.c +++ b/drivers/soc/rockchip/io-domain.c @@ -53,9 +53,6 @@ struct rockchip_iodomain; -/** - * @supplies: voltage settings matching the register bits. - */ struct rockchip_iodomain_soc_data { int grf_offset; const char *supply_names[MAX_SUPPLIES]; @@ -547,6 +544,7 @@ static int rockchip_iodomain_probe(struct platform_device *pdev) if (uV < 0) { dev_err(iod->dev, "Can't determine voltage: %s\n", supply_name); + ret = uV; goto unreg_notify; } |