Skip to content

Commit 9fa060d

Browse files
lkundrakwsakernel
authored andcommitted
i2c: pxa: don't error out if there's no pinctrl
The bus recovery patch regresses on OLPC XO-1.75 that has no pinctrl in its DT. Fixes: 7c9ec2c ("i2c: pxa: implement generic i2c bus recovery")' Signed-off-by: Lubomir Rintel <[email protected]> Signed-off-by: Wolfram Sang <[email protected]>
1 parent fad5972 commit 9fa060d

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

drivers/i2c/busses/i2c-pxa.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1348,6 +1348,8 @@ static int i2c_pxa_init_recovery(struct pxa_i2c *i2c)
13481348
return 0;
13491349

13501350
i2c->pinctrl = devm_pinctrl_get(dev);
1351+
if (PTR_ERR(i2c->pinctrl) == -ENODEV)
1352+
i2c->pinctrl = NULL;
13511353
if (IS_ERR(i2c->pinctrl))
13521354
return PTR_ERR(i2c->pinctrl);
13531355

0 commit comments

Comments
 (0)