From f65f36597b0cec008f1d486db9924fac77de8b65 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Sat, 8 Aug 2009 21:43:42 +0000 Subject: [PATCH] --- yaml --- r: 159460 b: refs/heads/master c: c9145a2df072f75d97592ddac1624baeb7bad195 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/jazzsonic.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 643fd2d44015..07d718a03db7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bdf50d7346588b22fd66367ae2890e2cbf574172 +refs/heads/master: c9145a2df072f75d97592ddac1624baeb7bad195 diff --git a/trunk/drivers/net/jazzsonic.c b/trunk/drivers/net/jazzsonic.c index ec337b502fd9..6e5b3f30527f 100644 --- a/trunk/drivers/net/jazzsonic.c +++ b/trunk/drivers/net/jazzsonic.c @@ -203,7 +203,7 @@ static int __devinit sonic_probe1(struct net_device *dev) return 0; out: - release_region(dev->base_addr, SONIC_MEM_SIZE); + release_mem_region(dev->base_addr, SONIC_MEM_SIZE); return err; } @@ -247,7 +247,7 @@ static int __devinit jazz_sonic_probe(struct platform_device *pdev) return 0; out1: - release_region(dev->base_addr, SONIC_MEM_SIZE); + release_mem_region(dev->base_addr, SONIC_MEM_SIZE); out: free_netdev(dev); @@ -269,7 +269,7 @@ static int __devexit jazz_sonic_device_remove (struct platform_device *pdev) unregister_netdev(dev); dma_free_coherent(lp->device, SIZEOF_SONIC_DESC * SONIC_BUS_SCALE(lp->dma_bitmode), lp->descriptors, lp->descriptors_laddr); - release_region (dev->base_addr, SONIC_MEM_SIZE); + release_mem_region(dev->base_addr, SONIC_MEM_SIZE); free_netdev(dev); return 0;