diff options
author | Ilia Mirkin <imirkin@alum.mit.edu> | 2011-03-13 00:29:01 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-14 11:57:32 -0700 |
commit | 306be9e1c167dcd7d6635bd434ee8e63ab22a5d6 (patch) | |
tree | 9fabb2cbd071607a63d1e958c6881efb7eb78d72 /drivers/staging/keucr | |
parent | 56d17639703b4683e3e9be36dff7c6d811f4cbf5 (diff) | |
download | linux-306be9e1c167dcd7d6635bd434ee8e63ab22a5d6.tar.bz2 |
staging: keucr: 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/keucr')
-rw-r--r-- | drivers/staging/keucr/ms.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/drivers/staging/keucr/ms.c b/drivers/staging/keucr/ms.c index 48496e4da42b..a7137217cf86 100644 --- a/drivers/staging/keucr/ms.c +++ b/drivers/staging/keucr/ms.c @@ -244,8 +244,8 @@ int MS_CardInit(struct us_data *us) result = MS_STATUS_SUCCESS; exit: - if (PageBuffer1) kfree(PageBuffer1); - if (PageBuffer0) kfree(PageBuffer0); + kfree(PageBuffer1); + kfree(PageBuffer0); printk("MS_CardInit end\n"); return result; @@ -280,7 +280,7 @@ int MS_LibCheckDisableBlock(struct us_data *us, WORD PhyBlock) } while(1); exit: - if (PageBuf) kfree(PageBuf); + kfree(PageBuf); return result; } @@ -324,17 +324,11 @@ void MS_LibFreeWriteBuf(struct us_data *us) //----- MS_LibFreeLogicalMap() --------------------------------------- int MS_LibFreeLogicalMap(struct us_data *us) { - if (us->MS_Lib.Phy2LogMap) - { - kfree(us->MS_Lib.Phy2LogMap); - us->MS_Lib.Phy2LogMap = NULL; - } + kfree(us->MS_Lib.Phy2LogMap); + us->MS_Lib.Phy2LogMap = NULL; - if (us->MS_Lib.Log2PhyMap) - { - kfree(us->MS_Lib.Log2PhyMap); - us->MS_Lib.Log2PhyMap = NULL; - } + kfree(us->MS_Lib.Log2PhyMap); + us->MS_Lib.Log2PhyMap = NULL; return 0; } @@ -470,7 +464,7 @@ int MS_LibProcessBootBlock(struct us_data *us, WORD PhyBlock, BYTE *PageData) exit: if (result) MS_LibFreeLogicalMap(us); - if (PageBuffer) kfree(PageBuffer); + kfree(PageBuffer); result = 0; return result; |