diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-10-12 23:38:02 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-10-12 23:38:02 -0400 |
| commit | 492c032beccd53f807811b6c14909630d409dd8c (patch) | |
| tree | 208550c6ccecb8f1b4f85edb91702ca2bdef855e /drivers/acpi/atomicio.c | |
| parent | f9d629c737cb6687216a0c540b5466a4bd8b070a (diff) | |
| parent | cb655d0f3d57c23db51b981648e452988c0223f9 (diff) | |
Merge commit 'v2.6.36-rc7' into spi/next
Diffstat (limited to 'drivers/acpi/atomicio.c')
| -rw-r--r-- | drivers/acpi/atomicio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/atomicio.c b/drivers/acpi/atomicio.c index 8f8bd736d4ff..542e53903891 100644 --- a/drivers/acpi/atomicio.c +++ b/drivers/acpi/atomicio.c | |||
| @@ -142,7 +142,7 @@ static void __iomem *acpi_pre_map(phys_addr_t paddr, | |||
| 142 | list_add_tail_rcu(&map->list, &acpi_iomaps); | 142 | list_add_tail_rcu(&map->list, &acpi_iomaps); |
| 143 | spin_unlock_irqrestore(&acpi_iomaps_lock, flags); | 143 | spin_unlock_irqrestore(&acpi_iomaps_lock, flags); |
| 144 | 144 | ||
| 145 | return vaddr + (paddr - pg_off); | 145 | return map->vaddr + (paddr - map->paddr); |
| 146 | err_unmap: | 146 | err_unmap: |
| 147 | iounmap(vaddr); | 147 | iounmap(vaddr); |
| 148 | return NULL; | 148 | return NULL; |