projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'clk-for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/clk...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
acpi
/
acpi_lpss.c
diff --git
a/drivers/acpi/acpi_lpss.c
b/drivers/acpi/acpi_lpss.c
index 6817b18ed7228490d4773cfd48cc1d9706c56ba5..502454c24e69708dbc6a3164142e2131b74008d6 100644
(file)
--- a/
drivers/acpi/acpi_lpss.c
+++ b/
drivers/acpi/acpi_lpss.c
@@
-351,13
+351,16
@@
static int acpi_lpss_create_device(struct acpi_device *adev,
pdata->mmio_size = resource_size(rentry->res);
pdata->mmio_base = ioremap(rentry->res->start,
pdata->mmio_size);
pdata->mmio_size = resource_size(rentry->res);
pdata->mmio_base = ioremap(rentry->res->start,
pdata->mmio_size);
- if (!pdata->mmio_base)
- goto err_out;
break;
}
acpi_dev_free_resource_list(&resource_list);
break;
}
acpi_dev_free_resource_list(&resource_list);
+ if (!pdata->mmio_base) {
+ ret = -ENOMEM;
+ goto err_out;
+ }
+
pdata->dev_desc = dev_desc;
if (dev_desc->setup)
pdata->dev_desc = dev_desc;
if (dev_desc->setup)