diff options
| -rw-r--r-- | drivers/mfd/intel_msic.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/mfd/intel_msic.c b/drivers/mfd/intel_msic.c index ab8d0b2739b2..1804331bd52c 100644 --- a/drivers/mfd/intel_msic.c +++ b/drivers/mfd/intel_msic.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | * published by the Free Software Foundation. | 9 | * published by the Free Software Foundation. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/err.h> | ||
| 12 | #include <linux/gpio.h> | 13 | #include <linux/gpio.h> |
| 13 | #include <linux/io.h> | 14 | #include <linux/io.h> |
| 14 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| @@ -424,11 +425,9 @@ static int intel_msic_probe(struct platform_device *pdev) | |||
| 424 | return -ENODEV; | 425 | return -ENODEV; |
| 425 | } | 426 | } |
| 426 | 427 | ||
| 427 | msic->irq_base = devm_request_and_ioremap(&pdev->dev, res); | 428 | msic->irq_base = devm_ioremap_resource(&pdev->dev, res); |
| 428 | if (!msic->irq_base) { | 429 | if (IS_ERR(msic->irq_base)) |
| 429 | dev_err(&pdev->dev, "failed to map SRAM memory\n"); | 430 | return PTR_ERR(msic->irq_base); |
| 430 | return -ENOMEM; | ||
| 431 | } | ||
| 432 | 431 | ||
| 433 | platform_set_drvdata(pdev, msic); | 432 | platform_set_drvdata(pdev, msic); |
| 434 | 433 | ||
