projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
video/rockchip: rga2: retry 10 times when timeout
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
bus
/
sunxi-rsb.c
diff --git
a/drivers/bus/sunxi-rsb.c
b/drivers/bus/sunxi-rsb.c
index 846bc29c157dcca1bde81f288a5d323476042295..25996e2561105ac615cf4cc99c468f7a8db0f3df 100644
(file)
--- a/
drivers/bus/sunxi-rsb.c
+++ b/
drivers/bus/sunxi-rsb.c
@@
-342,13
+342,13
@@
static int sunxi_rsb_read(struct sunxi_rsb *rsb, u8 rtaddr, u8 addr,
ret = _sunxi_rsb_run_xfer(rsb);
if (ret)
ret = _sunxi_rsb_run_xfer(rsb);
if (ret)
- goto
out
;
+ goto
unlock
;
*buf = readl(rsb->regs + RSB_DATA);
*buf = readl(rsb->regs + RSB_DATA);
+unlock:
mutex_unlock(&rsb->lock);
mutex_unlock(&rsb->lock);
-out:
return ret;
}
return ret;
}
@@
-527,9
+527,9
@@
static int sunxi_rsb_init_device_mode(struct sunxi_rsb *rsb)
*/
static const struct sunxi_rsb_addr_map sunxi_rsb_addr_maps[] = {
*/
static const struct sunxi_rsb_addr_map sunxi_rsb_addr_maps[] = {
- { 0x3
e
3, 0x2d }, /* Primary PMIC: AXP223, AXP809, AXP81X, ... */
+ { 0x3
a
3, 0x2d }, /* Primary PMIC: AXP223, AXP809, AXP81X, ... */
{ 0x745, 0x3a }, /* Secondary PMIC: AXP806, ... */
{ 0x745, 0x3a }, /* Secondary PMIC: AXP806, ... */
- { 0xe89, 0x4
5
}, /* Peripheral IC: AC100, ... */
+ { 0xe89, 0x4
e
}, /* Peripheral IC: AC100, ... */
};
static u8 sunxi_rsb_get_rtaddr(u16 hwaddr)
};
static u8 sunxi_rsb_get_rtaddr(u16 hwaddr)