diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-02-05 15:42:08 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-02-05 15:42:08 +0100 |
| commit | 38220a5e89389b587647128220cd328a5dc92e42 (patch) | |
| tree | 3b112a1fcc3828b2dfa9cb8f8d092b3eee4b6e14 /drivers/char/hpet.c | |
| parent | 550b3aac5a72c4209f1ad3bc0ade663d5cb36f7f (diff) | |
| parent | 2eedd3d8398b266ee8e846ded03218bb6a00e2c1 (diff) | |
Merge branch 'acpica' into acpi-ec
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); |