diff options
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/driver.c | 8 | ||||
| -rw-r--r-- | drivers/base/resource.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/base/driver.c b/drivers/base/driver.c index 31d6f2a406..6cd428681f 100644 --- a/drivers/base/driver.c +++ b/drivers/base/driver.c @@ -241,15 +241,15 @@ static struct resource *dev_get_resource(struct device_d *dev, int num) return NULL; } -void __iomem *dev_get_mem_region(struct device_d *dev, int num) +void *dev_get_mem_region(struct device_d *dev, int num) { struct resource *res; res = dev_get_resource(dev, num); if (!res) - return res; + return NULL; - return (void __force __iomem *)res->start; + return (void __force *)res->start; } EXPORT_SYMBOL(dev_get_mem_region); @@ -339,7 +339,7 @@ static int do_devinfo_subtree(struct device_d *dev, int depth) list_for_each_entry(cdev, &dev->cdevs, devices_list) { for (i = 0; i < depth + 1; i++) printf(" "); - printf("`---- 0x%08lx-0x%08lx: /dev/%s\n", + printf("`---- 0x%08llx-0x%08llx: /dev/%s\n", cdev->offset, cdev->offset + cdev->size - 1, cdev->name); diff --git a/drivers/base/resource.c b/drivers/base/resource.c index 6790af36d8..988d27ea93 100644 --- a/drivers/base/resource.c +++ b/drivers/base/resource.c @@ -113,7 +113,7 @@ struct device_d *add_usb_ehci_device(int id, resource_size_t hccr, res = xzalloc(sizeof(struct resource) * 2); res[0].start = hccr; - res[0].end = hccr + 0x40 - 1; + res[0].end = hccr + 0x10 - 1; res[0].flags = IORESOURCE_MEM; res[1].start = hcor; res[1].end = hcor + 0xc0 - 1; |