diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-12-24 01:16:02 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-12-24 01:16:02 -0500 |
| commit | f34548cb735b7a80bbbb0bdd09ad4c2173ba92d5 (patch) | |
| tree | e53c9e39b3149221779c10595bc59fa02de4f45f /drivers/spi/spi_sh_sci.c | |
| parent | 76382b5bdb77c29ab430e1b82ef1c604c8dd113b (diff) | |
| parent | 32b53076c31ce9159740b744d5eb5d9505312add (diff) | |
Merge branch 'sh/g3-prep' into sh/for-2.6.33
Diffstat (limited to 'drivers/spi/spi_sh_sci.c')
| -rw-r--r-- | drivers/spi/spi_sh_sci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi_sh_sci.c b/drivers/spi/spi_sh_sci.c index 7d36720eb982..a65c12ffa733 100644 --- a/drivers/spi/spi_sh_sci.c +++ b/drivers/spi/spi_sh_sci.c | |||
| @@ -148,7 +148,7 @@ static int sh_sci_spi_probe(struct platform_device *dev) | |||
| 148 | ret = -ENOENT; | 148 | ret = -ENOENT; |
| 149 | goto err1; | 149 | goto err1; |
| 150 | } | 150 | } |
| 151 | sp->membase = ioremap(r->start, r->end - r->start + 1); | 151 | sp->membase = ioremap(r->start, resource_size(r)); |
| 152 | if (!sp->membase) { | 152 | if (!sp->membase) { |
| 153 | ret = -ENXIO; | 153 | ret = -ENXIO; |
| 154 | goto err1; | 154 | goto err1; |