diff --git a/[refs] b/[refs]
index 25320559b151..010c1475a8e5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f3ab2636c5c1dd9ab0ff53a46d8354d5769ffdd4
+refs/heads/master: a56d5318716d120e040294bb258901ba89fb9c90
diff --git a/trunk/drivers/char/hpet.c b/trunk/drivers/char/hpet.c
index a4eee324eb1e..84e6a7e673b7 100644
--- a/trunk/drivers/char/hpet.c
+++ b/trunk/drivers/char/hpet.c
@@ -1000,6 +1000,8 @@ static int hpet_acpi_add(struct acpi_device *device)
 		return -ENODEV;
 
 	if (!data.hd_address || !data.hd_nirqs) {
+		if (data.hd_address)
+			iounmap(data.hd_address);
 		printk("%s: no address or irqs in _CRS\n", __func__);
 		return -ENODEV;
 	}