diff options
| author | Ilia Mirkin <imirkin@alum.mit.edu> | 2011-03-13 00:29:13 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-14 11:57:37 -0700 |
| commit | 794a8946ba2339af09dd1f39c8462c3611bebf77 (patch) | |
| tree | 7f154252519102ae5db39c5ad95279ff77ce8af1 /drivers/staging | |
| parent | 06dde506203147e8d245a505d491c40254561f17 (diff) | |
| download | linux-794a8946ba2339af09dd1f39c8462c3611bebf77.tar.bz2 | |
staging: vme: Remove NULL check before kfree
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/vme/bridges/vme_ca91cx42.c | 3 | ||||
| -rw-r--r-- | 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 5d734d9ed27d..d4a48c4e59c2 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 2df19eacbca5..b00a53e793e7 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)); } |