projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
[linux-2.6-microblaze.git]
/
drivers
/
clk
/
davinci
/
da8xx-cfgchip.c
diff --git
a/drivers/clk/davinci/da8xx-cfgchip.c
b/drivers/clk/davinci/da8xx-cfgchip.c
index
aae62a5
..
d1bbee1
100644
(file)
--- 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(usb
0
) == -EPROBE_DEFER)
+ if (PTR_ERR(usb
1
) == -EPROBE_DEFER)
return -EPROBE_DEFER;
dev_warn(dev, "Failed to register usb1_clk48 (%ld)\n",