diff options
| author | Alan Cox <alan@linux.intel.com> | 2014-04-28 15:50:56 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-03 19:48:09 -0400 |
| commit | c1bc97f8f498a2bfab63ceef761fb0e88ef7c065 (patch) | |
| tree | 584ab2ddd1bbc195dd7cdbf1a92d3dc4fa327ce0 /drivers | |
| parent | 425f3740cf8e93fac6318ed862bcc3081b818f0b (diff) | |
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')
| -rw-r--r-- | drivers/platform/goldfish/pdev_bus.c | 5 |
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) | |||
| 184 | pdev_bus_addr = r->start; | 184 | pdev_bus_addr = r->start; |
| 185 | pdev_bus_len = resource_size(r); | 185 | pdev_bus_len = resource_size(r); |
| 186 | 186 | ||
| 187 | if (request_mem_region(pdev_bus_addr, pdev_bus_len, "goldfish")) { | ||
| 188 | dev_err(&pdev->dev, "unable to reserve Goldfish MMIO.\n"); | ||
| 189 | return -EBUSY; | ||
| 190 | } | ||
| 191 | |||
| 192 | pdev_bus_base = ioremap(pdev_bus_addr, pdev_bus_len); | 187 | pdev_bus_base = ioremap(pdev_bus_addr, pdev_bus_len); |
| 193 | if (pdev_bus_base == NULL) { | 188 | if (pdev_bus_base == NULL) { |
| 194 | ret = -ENOMEM; | 189 | ret = -ENOMEM; |
