diff options
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/hpet.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c index 7ecffc9c738f..fd51554ab081 100644 --- a/drivers/char/hpet.c +++ b/drivers/char/hpet.c | |||
@@ -943,14 +943,14 @@ static acpi_status hpet_resources(struct acpi_resource *res, void *data) | |||
943 | printk(KERN_DEBUG "%s: 0x%lx is busy\n", | 943 | printk(KERN_DEBUG "%s: 0x%lx is busy\n", |
944 | __FUNCTION__, hdp->hd_phys_address); | 944 | __FUNCTION__, hdp->hd_phys_address); |
945 | iounmap(hdp->hd_address); | 945 | iounmap(hdp->hd_address); |
946 | return -EBUSY; | 946 | return AE_ALREADY_EXISTS; |
947 | } | 947 | } |
948 | } else if (res->type == ACPI_RESOURCE_TYPE_FIXED_MEMORY32) { | 948 | } else if (res->type == ACPI_RESOURCE_TYPE_FIXED_MEMORY32) { |
949 | struct acpi_resource_fixed_memory32 *fixmem32; | 949 | struct acpi_resource_fixed_memory32 *fixmem32; |
950 | 950 | ||
951 | fixmem32 = &res->data.fixed_memory32; | 951 | fixmem32 = &res->data.fixed_memory32; |
952 | if (!fixmem32) | 952 | if (!fixmem32) |
953 | return -EINVAL; | 953 | return AE_NO_MEMORY; |
954 | 954 | ||
955 | hdp->hd_phys_address = fixmem32->address; | 955 | hdp->hd_phys_address = fixmem32->address; |
956 | hdp->hd_address = ioremap(fixmem32->address, | 956 | hdp->hd_address = ioremap(fixmem32->address, |
@@ -960,7 +960,7 @@ static acpi_status hpet_resources(struct acpi_resource *res, void *data) | |||
960 | printk(KERN_DEBUG "%s: 0x%lx is busy\n", | 960 | printk(KERN_DEBUG "%s: 0x%lx is busy\n", |
961 | __FUNCTION__, hdp->hd_phys_address); | 961 | __FUNCTION__, hdp->hd_phys_address); |
962 | iounmap(hdp->hd_address); | 962 | iounmap(hdp->hd_address); |
963 | return -EBUSY; | 963 | return AE_ALREADY_EXISTS; |
964 | } | 964 | } |
965 | } else if (res->type == ACPI_RESOURCE_TYPE_EXTENDED_IRQ) { | 965 | } else if (res->type == ACPI_RESOURCE_TYPE_EXTENDED_IRQ) { |
966 | struct acpi_resource_extended_irq *irqp; | 966 | struct acpi_resource_extended_irq *irqp; |