aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/powerpc/lib/rheap.c2
-rw-r--r--arch/powerpc/platforms/cell/celleb_pci.c5
2 files changed, 3 insertions, 4 deletions
diff --git a/arch/powerpc/lib/rheap.c b/arch/powerpc/lib/rheap.c
index a1060a868e69..69abf844c2c3 100644
--- a/arch/powerpc/lib/rheap.c
+++ b/arch/powerpc/lib/rheap.c
@@ -284,7 +284,7 @@ EXPORT_SYMBOL_GPL(rh_create);
284 */ 284 */
285void rh_destroy(rh_info_t * info) 285void rh_destroy(rh_info_t * info)
286{ 286{
287 if ((info->flags & RHIF_STATIC_BLOCK) == 0 && info->block != NULL) 287 if ((info->flags & RHIF_STATIC_BLOCK) == 0)
288 kfree(info->block); 288 kfree(info->block);
289 289
290 if ((info->flags & RHIF_STATIC_INFO) == 0) 290 if ((info->flags & RHIF_STATIC_INFO) == 0)
diff --git a/arch/powerpc/platforms/cell/celleb_pci.c b/arch/powerpc/platforms/cell/celleb_pci.c
index 3ce70ded2d6a..9b11b5dd8b7c 100644
--- a/arch/powerpc/platforms/cell/celleb_pci.c
+++ b/arch/powerpc/platforms/cell/celleb_pci.c
@@ -393,11 +393,10 @@ static int __init celleb_setup_fake_pci_device(struct device_node *node,
393 393
394error: 394error:
395 if (mem_init_done) { 395 if (mem_init_done) {
396 if (config && *config) 396 if (config)
397 kfree(*config); 397 kfree(*config);
398 if (res && *res) 398 if (res)
399 kfree(*res); 399 kfree(*res);
400
401 } else { 400 } else {
402 if (config && *config) { 401 if (config && *config) {
403 size = 256; 402 size = 256;