lkml.org 
[lkml]   [2019]   [Nov]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.9 13/13] net: ep93xx_eth: fix mismatch of request_mem_region in remove
    Date
    From: Chuhong Yuan <hslester96@gmail.com>

    [ Upstream commit 3df70afe8d33f4977d0e0891bdcfb639320b5257 ]

    The driver calls release_resource in remove to match request_mem_region
    in probe, which is incorrect.
    Fix it by using the right one, release_mem_region.

    Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/cirrus/ep93xx_eth.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/drivers/net/ethernet/cirrus/ep93xx_eth.c b/drivers/net/ethernet/cirrus/ep93xx_eth.c
    index 9a161e9815297..24f69034f52c4 100644
    --- a/drivers/net/ethernet/cirrus/ep93xx_eth.c
    +++ b/drivers/net/ethernet/cirrus/ep93xx_eth.c
    @@ -780,6 +780,7 @@ static int ep93xx_eth_remove(struct platform_device *pdev)
    {
    struct net_device *dev;
    struct ep93xx_priv *ep;
    + struct resource *mem;

    dev = platform_get_drvdata(pdev);
    if (dev == NULL)
    @@ -795,8 +796,8 @@ static int ep93xx_eth_remove(struct platform_device *pdev)
    iounmap(ep->base_addr);

    if (ep->res != NULL) {
    - release_resource(ep->res);
    - kfree(ep->res);
    + mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
    + release_mem_region(mem->start, resource_size(mem));
    }

    free_netdev(dev);
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-11-22 20:51    [W:2.488 / U:0.648 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site