Skip to content

Commit

Permalink
staging: keucr: Remove NULL check before kfree
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Ilia Mirkin authored and Greg Kroah-Hartman committed Mar 14, 2011
1 parent 56d1763 commit 306be9e
Showing 1 changed file with 8 additions and 14 deletions.
22 changes: 8 additions & 14 deletions drivers/staging/keucr/ms.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -280,7 +280,7 @@ int MS_LibCheckDisableBlock(struct us_data *us, WORD PhyBlock)
} while(1);

exit:
if (PageBuf) kfree(PageBuf);
kfree(PageBuf);
return result;
}

Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 306be9e

Please sign in to comment.