diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-05-23 11:35:33 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-05-23 11:35:33 +0900 |
| commit | 8ace5c4698ec8da53e69095596718d5a936433de (patch) | |
| tree | 1f5959b3ac289e3bde420cc14109be0cc518a75a /drivers/isdn/hisax/st5481_init.c | |
| parent | a375b15164dd9264f724ad941825e52c90145151 (diff) | |
| parent | 71a8638480eb8fb6cfabe2ee9ca3fbc6e3453a14 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest
Diffstat (limited to 'drivers/isdn/hisax/st5481_init.c')
| -rw-r--r-- | drivers/isdn/hisax/st5481_init.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/isdn/hisax/st5481_init.c b/drivers/isdn/hisax/st5481_init.c index 13751237bfc..9f7fd18ff77 100644 --- a/drivers/isdn/hisax/st5481_init.c +++ b/drivers/isdn/hisax/st5481_init.c @@ -46,8 +46,6 @@ module_param(debug, int, 0); #endif int st5481_debug; -static LIST_HEAD(adapter_list); - /* ====================================================================== * registration/deregistration with the USB layer */ @@ -86,7 +84,6 @@ static int probe_st5481(struct usb_interface *intf, adapter->bcs[i].b_if.ifc.priv = &adapter->bcs[i]; adapter->bcs[i].b_if.ifc.l2l1 = st5481_b_l2l1; } - list_add(&adapter->list, &adapter_list); retval = st5481_setup_usb(adapter); if (retval < 0) @@ -125,6 +122,7 @@ static int probe_st5481(struct usb_interface *intf, err_usb: st5481_release_usb(adapter); err: + kfree(adapter); return -EIO; } @@ -142,8 +140,6 @@ static void disconnect_st5481(struct usb_interface *intf) if (!adapter) return; - list_del(&adapter->list); - st5481_stop(adapter); st5481_release_b(&adapter->bcs[1]); st5481_release_b(&adapter->bcs[0]); |