Commit c1bc97f8 authored by Alan Cox's avatar Alan Cox Committed by Greg Kroah-Hartman

goldfish bus: don't call request_mem_region

This is a bug fix that has been lurking in the Google tree but not pushed
upstream.

From: Octavian Purdila <octavian.purdila@intel.com>

The memory region is already reserved in goldfish_init() during
platform init.
Signed-off-by: default avatarOctavian Purdila <octavian.purdila@intel.com>
Signed-off-by: default avatarJun Tian <jun.j.tian@intel.com>
Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 425f3740
...@@ -184,11 +184,6 @@ static int goldfish_pdev_bus_probe(struct platform_device *pdev) ...@@ -184,11 +184,6 @@ static int goldfish_pdev_bus_probe(struct platform_device *pdev)
pdev_bus_addr = r->start; pdev_bus_addr = r->start;
pdev_bus_len = resource_size(r); pdev_bus_len = resource_size(r);
if (request_mem_region(pdev_bus_addr, pdev_bus_len, "goldfish")) {
dev_err(&pdev->dev, "unable to reserve Goldfish MMIO.\n");
return -EBUSY;
}
pdev_bus_base = ioremap(pdev_bus_addr, pdev_bus_len); pdev_bus_base = ioremap(pdev_bus_addr, pdev_bus_len);
if (pdev_bus_base == NULL) { if (pdev_bus_base == NULL) {
ret = -ENOMEM; ret = -ENOMEM;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment