diff options
| author | Stephen Boyd <sboyd@kernel.org> | 2018-06-27 20:01:29 +0200 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2018-06-27 20:01:29 +0200 |
| commit | c34cc2f26a4a4c434f36746710f7aff800d8db57 (patch) | |
| tree | a9dbaf21950d9df16ea53cd505ff03d885f8f48f /drivers | |
| parent | clk: sunxi-ng: replace lib-y with obj-y (diff) | |
| parent | clk: davinci: fix a typo (which leads to build failures) (diff) | |
| download | linux-c34cc2f26a4a4c434f36746710f7aff800d8db57.tar.xz linux-c34cc2f26a4a4c434f36746710f7aff800d8db57.zip | |
Merge tag 'clk-davinci-fixes-4.18' of https://github.com/dlech/linux into clk-fixes
Pull davinci clk fixes for 4.18 from David Lechner:
Here are a couple of typo fixes for clk-davinci for 4.18.
* tag 'clk-davinci-fixes-4.18' of https://github.com/dlech/linux:
clk: davinci: fix a typo (which leads to build failures)
clk: davinci: cfgchip: testing the wrong variable
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/clk/davinci/da8xx-cfgchip.c | 2 | ||||
| -rw-r--r-- | drivers/clk/davinci/psc.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/davinci/da8xx-cfgchip.c b/drivers/clk/davinci/da8xx-cfgchip.c index aae62a5b8734..d1bbee19ed0f 100644 --- a/drivers/clk/davinci/da8xx-cfgchip.c +++ b/drivers/clk/davinci/da8xx-cfgchip.c @@ -672,7 +672,7 @@ static int of_da8xx_usb_phy_clk_init(struct device *dev, struct regmap *regmap) usb1 = da8xx_cfgchip_register_usb1_clk48(dev, regmap); if (IS_ERR(usb1)) { - if (PTR_ERR(usb0) == -EPROBE_DEFER) + if (PTR_ERR(usb1) == -EPROBE_DEFER) return -EPROBE_DEFER; dev_warn(dev, "Failed to register usb1_clk48 (%ld)\n", diff --git a/drivers/clk/davinci/psc.h b/drivers/clk/davinci/psc.h index 6a42529d31a9..cc5614567a70 100644 --- a/drivers/clk/davinci/psc.h +++ b/drivers/clk/davinci/psc.h @@ -107,7 +107,7 @@ extern const struct davinci_psc_init_data of_da850_psc1_init_data; #ifdef CONFIG_ARCH_DAVINCI_DM355 extern const struct davinci_psc_init_data dm355_psc_init_data; #endif -#ifdef CONFIG_ARCH_DAVINCI_DM356 +#ifdef CONFIG_ARCH_DAVINCI_DM365 extern const struct davinci_psc_init_data dm365_psc_init_data; #endif #ifdef CONFIG_ARCH_DAVINCI_DM644x |