diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-25 08:15:31 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-25 08:15:31 -0500 |
| commit | 52e04ea89da57274f0313d2bd73ba02f686cfdeb (patch) | |
| tree | 6ce5d086bcaea4cb534b3fcf6ba736eb48d582a4 /drivers/spi/spi_sh_sci.c | |
| parent | 41116e926cb92292fa4fcbe888ae8133fa0038e6 (diff) | |
| parent | 8b90ca08821fee79e181bfcbc3bbd41ef5637136 (diff) | |
Merge branch 'fix/misc' into topic/misc
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; |