diff options
Diffstat (limited to 'drivers/net/dm9k.c')
| -rw-r--r-- | drivers/net/dm9k.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/net/dm9k.c b/drivers/net/dm9k.c index d813c8c275..ad402e3efc 100644 --- a/drivers/net/dm9k.c +++ b/drivers/net/dm9k.c @@ -785,6 +785,7 @@ static int dm9000_parse_pdata(struct device_d *dev, struct dm9k *priv) static int dm9k_probe(struct device_d *dev) { + struct resource *iores; unsigned io_mode; struct eth_device *edev; struct dm9k *priv; @@ -808,17 +809,19 @@ static int dm9k_probe(struct device_d *dev) if (ret) goto err; - priv->iodata = dev_request_mem_region(dev, 1); - if (IS_ERR(priv->iodata)) { - ret = PTR_ERR(priv->iodata); + iores = dev_request_mem_resource(dev, 1); + if (IS_ERR(iores)) { + ret = PTR_ERR(iores); goto err; } + priv->iodata = IOMEM(iores->start); - priv->iobase = dev_request_mem_region(dev, 0); - if (IS_ERR(priv->iobase)) { - ret = PTR_ERR(priv->iobase); + iores = dev_request_mem_resource(dev, 0); + if (IS_ERR(iores)) { + ret = PTR_ERR(iores); goto err; } + priv->iobase = IOMEM(iores->start); edev->init = dm9k_init_dev; edev->open = dm9k_eth_open; |