summaryrefslogtreecommitdiff
path: root/drivers/platform/goldfish
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2014-04-28 23:50:56 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-05-04 03:48:09 +0400
commitc1bc97f8f498a2bfab63ceef761fb0e88ef7c065 (patch)
tree584ab2ddd1bbc195dd7cdbf1a92d3dc4fa327ce0 /drivers/platform/goldfish
parent425f3740cf8e93fac6318ed862bcc3081b818f0b (diff)
downloadlinux-c1bc97f8f498a2bfab63ceef761fb0e88ef7c065.tar.xz
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: Octavian Purdila <octavian.purdila@intel.com> Signed-off-by: Jun Tian <jun.j.tian@intel.com> Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/platform/goldfish')
-rw-r--r--drivers/platform/goldfish/pdev_bus.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/platform/goldfish/pdev_bus.c b/drivers/platform/goldfish/pdev_bus.c
index 92cc4cfafde5..4eb2bb34790d 100644
--- a/drivers/platform/goldfish/pdev_bus.c
+++ b/drivers/platform/goldfish/pdev_bus.c
@@ -184,11 +184,6 @@ static int goldfish_pdev_bus_probe(struct platform_device *pdev)
pdev_bus_addr = r->start;
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);
if (pdev_bus_base == NULL) {
ret = -ENOMEM;