diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/spi/spi_sh_sci.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
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; |