lkml.org 
[lkml]   [2011]   [Mar]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 20/24] staging: vme: Remove NULL check before kfree
    Date
    This patch was generated by the following semantic patch:
    // <smpl>
    @@ expression E; @@
    - if (E != NULL) { kfree(E); }
    + kfree(E);

    @@ expression E; @@
    - if (E != NULL) { kfree(E); E = NULL; }
    + kfree(E);
    + E = NULL;
    // </smpl>

    Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
    ---
    drivers/staging/vme/bridges/vme_ca91cx42.c | 3 +--
    drivers/staging/vme/bridges/vme_tsi148.c | 3 +--
    2 files changed, 2 insertions(+), 4 deletions(-)

    diff --git a/drivers/staging/vme/bridges/vme_ca91cx42.c b/drivers/staging/vme/bridges/vme_ca91cx42.c
    index 5d734d9..d4a48c4 100644
    --- a/drivers/staging/vme/bridges/vme_ca91cx42.c
    +++ b/drivers/staging/vme/bridges/vme_ca91cx42.c
    @@ -516,8 +516,7 @@ static int ca91cx42_alloc_resource(struct vme_master_resource *image,
    if (existing_size != 0) {
    iounmap(image->kern_base);
    image->kern_base = NULL;
    - if (image->bus_resource.name != NULL)
    - kfree(image->bus_resource.name);
    + kfree(image->bus_resource.name);
    release_resource(&image->bus_resource);
    memset(&image->bus_resource, 0, sizeof(struct resource));
    }
    diff --git a/drivers/staging/vme/bridges/vme_tsi148.c b/drivers/staging/vme/bridges/vme_tsi148.c
    index 2df19ea..b00a53e 100644
    --- a/drivers/staging/vme/bridges/vme_tsi148.c
    +++ b/drivers/staging/vme/bridges/vme_tsi148.c
    @@ -821,8 +821,7 @@ static int tsi148_alloc_resource(struct vme_master_resource *image,
    if (existing_size != 0) {
    iounmap(image->kern_base);
    image->kern_base = NULL;
    - if (image->bus_resource.name != NULL)
    - kfree(image->bus_resource.name);
    + kfree(image->bus_resource.name);
    release_resource(&image->bus_resource);
    memset(&image->bus_resource, 0, sizeof(struct resource));
    }
    --
    1.7.3.4


    \
     
     \ /
      Last update: 2011-03-13 06:45    [W:0.020 / U:90.200 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site