diff options
Diffstat (limited to 'drivers/w1')
-rw-r--r-- | drivers/w1/masters/mxc_w1.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/w1/masters/mxc_w1.c b/drivers/w1/masters/mxc_w1.c index 950d354d50e2..47e12cfc2a57 100644 --- a/drivers/w1/masters/mxc_w1.c +++ b/drivers/w1/masters/mxc_w1.c | |||
@@ -121,9 +121,9 @@ static int mxc_w1_probe(struct platform_device *pdev) | |||
121 | mdev->clkdiv = (clk_get_rate(mdev->clk) / 1000000) - 1; | 121 | mdev->clkdiv = (clk_get_rate(mdev->clk) / 1000000) - 1; |
122 | 122 | ||
123 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 123 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
124 | mdev->regs = devm_request_and_ioremap(&pdev->dev, res); | 124 | mdev->regs = devm_ioremap_resource(&pdev->dev, res); |
125 | if (!mdev->regs) | 125 | if (IS_ERR(mdev->regs)) |
126 | return -EBUSY; | 126 | return PTR_ERR(mdev->regs); |
127 | 127 | ||
128 | clk_prepare_enable(mdev->clk); | 128 | clk_prepare_enable(mdev->clk); |
129 | __raw_writeb(mdev->clkdiv, mdev->regs + MXC_W1_TIME_DIVIDER); | 129 | __raw_writeb(mdev->clkdiv, mdev->regs + MXC_W1_TIME_DIVIDER); |