diff options
author | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 09:48:20 +0200 |
---|---|---|
committer | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 14:02:16 +0200 |
commit | 2489007e7d740ccbc3e0a202914e243ad5178787 (patch) | |
tree | b8e6380ea7b1da63474ad68a5dba997e01146043 /drivers/gud/MobiCoreDriver/mcDrvModule.c | |
parent | 5f67568eb31e3a813c7c52461dcf66ade15fc2e7 (diff) | |
download | kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.zip kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.gz kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.bz2 |
merge opensource jb u5
Change-Id: I1aaec157aa196f3448eff8636134fce89a814cf2
Diffstat (limited to 'drivers/gud/MobiCoreDriver/mcDrvModule.c')
-rw-r--r-- | drivers/gud/MobiCoreDriver/mcDrvModule.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gud/MobiCoreDriver/mcDrvModule.c b/drivers/gud/MobiCoreDriver/mcDrvModule.c index 8e1c07f..0914abe 100644 --- a/drivers/gud/MobiCoreDriver/mcDrvModule.c +++ b/drivers/gud/MobiCoreDriver/mcDrvModule.c @@ -486,7 +486,7 @@ static struct mcL2TablesDescr *allocateWsmL2TableContainer( SetPageReserved(pPage); /* allocate a descriptor */ - pWsmL2TablesChunk = kmalloc(sizeof(*pWsmL2TablesChunk), + pWsmL2TablesChunk = kmalloc(sizeof(struct mcL2TablesChunk), GFP_KERNEL); if (NULL == pWsmL2TablesChunk) { kfree(pWsmL2Page); @@ -526,7 +526,8 @@ static struct mcL2TablesDescr *allocateWsmL2TableContainer( if (0 != ret) { if (NULL != pWsmL2TableDescr) { /* remove from list */ - list_del(&(pWsmL2TablesChunk->list)); + if (pWsmL2TablesChunk != NULL) + list_del(&(pWsmL2TablesChunk->list)); /* free memory */ kfree(pWsmL2TableDescr); pWsmL2TableDescr = NULL; |