Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 311e54c07e784fe63d421f724dcc597d1f82ccad

Authored by H Hartley Sweeten
Committed by Samuel Ortiz
1 parent 08b8499bdd
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

mfd: Use resource_size() in sm501 

The requested memory region is smaller than the actual ioremap().
Use resource_size() to get the correct size.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

Showing 1 changed file with 3 additions and 4 deletions Side-by-side Diff

... ... @@ -1430,7 +1430,7 @@
1430 1430 }
1431 1431  
1432 1432 sm->regs_claim = request_mem_region(sm->io_res->start,
1433   - 0x100, "sm501");
  1433 + resource_size(sm->io_res), "sm501");
1434 1434  
1435 1435 if (sm->regs_claim == NULL) {
1436 1436 dev_err(&dev->dev, "cannot claim registers\n");
... ... @@ -1440,8 +1440,7 @@
1440 1440  
1441 1441 platform_set_drvdata(dev, sm);
1442 1442  
1443   - sm->regs = ioremap(sm->io_res->start,
1444   - (sm->io_res->end - sm->io_res->start) - 1);
  1443 + sm->regs = ioremap(sm->io_res->start, resource_size(sm->io_res));
1445 1444  
1446 1445 if (sm->regs == NULL) {
1447 1446 dev_err(&dev->dev, "cannot remap registers\n");
... ... @@ -1645,7 +1644,7 @@
1645 1644 sm->mem_res = &dev->resource[0];
1646 1645  
1647 1646 sm->regs_claim = request_mem_region(sm->io_res->start,
1648   - 0x100, "sm501");
  1647 + resource_size(sm->io_res), "sm501");
1649 1648 if (sm->regs_claim == NULL) {
1650 1649 dev_err(&dev->dev, "cannot claim registers\n");
1651 1650 err= -EBUSY;