diff options
Diffstat (limited to 'drivers/pinctrl/pinctrl-falcon.c')
| -rw-r--r-- | drivers/pinctrl/pinctrl-falcon.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/pinctrl/pinctrl-falcon.c b/drivers/pinctrl/pinctrl-falcon.c index 4a0d54a08890..af97a1f90007 100644 --- a/drivers/pinctrl/pinctrl-falcon.c +++ b/drivers/pinctrl/pinctrl-falcon.c | |||
| @@ -447,14 +447,11 @@ static int pinctrl_falcon_probe(struct platform_device *pdev) | |||
| 447 | dev_err(&ppdev->dev, "failed to get clock\n"); | 447 | dev_err(&ppdev->dev, "failed to get clock\n"); |
| 448 | return PTR_ERR(falcon_info.clk[*bank]); | 448 | return PTR_ERR(falcon_info.clk[*bank]); |
| 449 | } | 449 | } |
| 450 | falcon_info.membase[*bank] = | 450 | falcon_info.membase[*bank] = devm_ioremap_resource(&pdev->dev, |
| 451 | devm_request_and_ioremap(&pdev->dev, &res); | 451 | &res); |
| 452 | if (!falcon_info.membase[*bank]) { | 452 | if (IS_ERR(falcon_info.membase[*bank])) |
| 453 | dev_err(&pdev->dev, | 453 | return PTR_ERR(falcon_info.membase[*bank]); |
| 454 | "Failed to remap memory for bank %d\n", | 454 | |
| 455 | *bank); | ||
| 456 | return -ENOMEM; | ||
| 457 | } | ||
| 458 | avail = pad_r32(falcon_info.membase[*bank], | 455 | avail = pad_r32(falcon_info.membase[*bank], |
| 459 | LTQ_PADC_AVAIL); | 456 | LTQ_PADC_AVAIL); |
| 460 | pins = fls(avail); | 457 | pins = fls(avail); |