projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fad5972
)
i2c: pxa: don't error out if there's no pinctrl
author
Lubomir Rintel
<lkundrak@v3.sk>
Tue, 2 Jun 2020 19:38:23 +0000
(21:38 +0200)
committer
Wolfram Sang
<wsa@kernel.org>
Wed, 3 Jun 2020 20:37:37 +0000
(22:37 +0200)
The bus recovery patch regresses on OLPC XO-1.75 that has no pinctrl in
its DT.
Fixes:
7c9ec2c52518
("i2c: pxa: implement generic i2c bus recovery")'
Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
drivers/i2c/busses/i2c-pxa.c
patch
|
blob
|
history
diff --git
a/drivers/i2c/busses/i2c-pxa.c
b/drivers/i2c/busses/i2c-pxa.c
index
a7885b8
..
35ca2c0
100644
(file)
--- a/
drivers/i2c/busses/i2c-pxa.c
+++ b/
drivers/i2c/busses/i2c-pxa.c
@@
-1348,6
+1348,8
@@
static int i2c_pxa_init_recovery(struct pxa_i2c *i2c)
return 0;
i2c->pinctrl = devm_pinctrl_get(dev);
+ if (PTR_ERR(i2c->pinctrl) == -ENODEV)
+ i2c->pinctrl = NULL;
if (IS_ERR(i2c->pinctrl))
return PTR_ERR(i2c->pinctrl);