aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn/hisax/hisax_fcpcipnp.c
diff options
context:
space:
mode:
authorAlan Stern <stern@rowland.harvard.edu>2007-05-23 13:58:12 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-23 20:14:14 -0700
commitae2d990eede0ef5938c210d48a177c044258ecd8 (patch)
tree7b4647fee2ef54f65583b1daaf406a88935b58ff /drivers/isdn/hisax/hisax_fcpcipnp.c
parent9d9a2000e683ecd497b65d5f3e73b048c68976e1 (diff)
downloadkernel_samsung_smdk4412-ae2d990eede0ef5938c210d48a177c044258ecd8.zip
kernel_samsung_smdk4412-ae2d990eede0ef5938c210d48a177c044258ecd8.tar.gz
kernel_samsung_smdk4412-ae2d990eede0ef5938c210d48a177c044258ecd8.tar.bz2
HiSax: fix error checking for hisax_register()]
This patch (as875) adds error-checking to the callers of hisax_register(). It also changes an error pathway in that routine, making it return an error code rather than 0. This fixes Bugzilla #7960. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Acked-by: Karsten Keil <kkeil@suse.de> Cc: Martin Bachem <info@colognechip.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/isdn/hisax/hisax_fcpcipnp.c')
-rw-r--r--drivers/isdn/hisax/hisax_fcpcipnp.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/isdn/hisax/hisax_fcpcipnp.c b/drivers/isdn/hisax/hisax_fcpcipnp.c
index 9e088fc..7993e01 100644
--- a/drivers/isdn/hisax/hisax_fcpcipnp.c
+++ b/drivers/isdn/hisax/hisax_fcpcipnp.c
@@ -859,7 +859,11 @@ new_adapter(void)
for (i = 0; i < 2; i++)
b_if[i] = &adapter->bcs[i].b_if;
- hisax_register(&adapter->isac.hisax_d_if, b_if, "fcpcipnp", protocol);
+ if (hisax_register(&adapter->isac.hisax_d_if, b_if, "fcpcipnp",
+ protocol) != 0) {
+ kfree(adapter);
+ adapter = NULL;
+ }
return adapter;
}