aboutsummaryrefslogtreecommitdiff
path: root/drivers/s390/net/qeth_eddp.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-12-24 11:55:16 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-12-24 11:55:16 -0800
commita7c2491a13cc72fc09c062e635b9a77ff6bb4a73 (patch)
treef8f4ed7bbc05369aadfd32668b892fe2740a0f3b /drivers/s390/net/qeth_eddp.c
parent1836098f97d22c81652aeeec64d1819dc2177bdb (diff)
parent3df3cc6d18b6dcd38c33c198fb8adf1f1fa5f4a7 (diff)
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/s390/net/qeth_eddp.c')
-rw-r--r--drivers/s390/net/qeth_eddp.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/s390/net/qeth_eddp.c b/drivers/s390/net/qeth_eddp.c
index 011915d5e24..f94f1f25eec 100644
--- a/drivers/s390/net/qeth_eddp.c
+++ b/drivers/s390/net/qeth_eddp.c
@@ -62,7 +62,8 @@ qeth_eddp_free_context(struct qeth_eddp_context *ctx)
for (i = 0; i < ctx->num_pages; ++i)
free_page((unsigned long)ctx->pages[i]);
kfree(ctx->pages);
- kfree(ctx->elements);
+ if (ctx->elements != NULL)
+ kfree(ctx->elements);
kfree(ctx);
}