diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-02-03 22:27:01 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-02-03 22:27:01 +0100 |
| commit | b2cd5dd71a59a85d910f52070992decd406f9da7 (patch) | |
| tree | 6eb847a2b953f5b8929f0d4b0623382fa0df3094 /drivers/char/hpet.c | |
| parent | Linux 3.19-rc7 (diff) | |
| parent | ACPICA: Resources: Provide common part for struct acpi_resource_address struc... (diff) | |
| download | linux-b2cd5dd71a59a85d910f52070992decd406f9da7.tar.xz linux-b2cd5dd71a59a85d910f52070992decd406f9da7.zip | |
Merge branch 'acpica' into acpi-resources
Diffstat (limited to 'drivers/char/hpet.c')
| -rw-r--r-- | drivers/char/hpet.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c index d5d4cd82b9f7..5c0baa9ffc64 100644 --- a/drivers/char/hpet.c +++ b/drivers/char/hpet.c @@ -976,8 +976,8 @@ static acpi_status hpet_resources(struct acpi_resource *res, void *data) status = acpi_resource_to_address64(res, &addr); if (ACPI_SUCCESS(status)) { - hdp->hd_phys_address = addr.minimum; - hdp->hd_address = ioremap(addr.minimum, addr.address_length); + hdp->hd_phys_address = addr.address.minimum; + hdp->hd_address = ioremap(addr.address.minimum, addr.address.address_length); if (hpet_is_known(hdp)) { iounmap(hdp->hd_address); |