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>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
425f3740cf
commit
c1bc97f8f4
@ -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;
|
||||||
|
Reference in New Issue
Block a user