diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-01 01:58:36 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-01 01:58:36 -0500 |
| commit | 6946d28a9f47f50fe3dd916e8b4229de9769108e (patch) | |
| tree | eaa7499bf7fd367cbacf777d8eec8ed038ef287d /drivers/usb/atm/usbatm.c | |
| parent | 6c9e5eb522bca694a0311898039d2707e9bc7783 (diff) | |
| parent | 5666c0947ede0432ba5148570aa66ffb9febff5b (diff) | |
| download | kernel-crypto-6946d28a9f47f50fe3dd916e8b4229de9769108e.tar.gz kernel-crypto-6946d28a9f47f50fe3dd916e8b4229de9769108e.tar.xz kernel-crypto-6946d28a9f47f50fe3dd916e8b4229de9769108e.zip | |
Merge branch 'master'
Diffstat (limited to 'drivers/usb/atm/usbatm.c')
| -rw-r--r-- | drivers/usb/atm/usbatm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c index c466739428b..2e6593e6c1b 100644 --- a/drivers/usb/atm/usbatm.c +++ b/drivers/usb/atm/usbatm.c @@ -879,7 +879,7 @@ static int usbatm_atm_init(struct usbatm_data *instance) fail: instance->atm_dev = NULL; - shutdown_atm_dev(atm_dev); /* usbatm_atm_dev_close will eventually be called */ + atm_dev_deregister(atm_dev); /* usbatm_atm_dev_close will eventually be called */ return ret; } @@ -1164,7 +1164,7 @@ void usbatm_usb_disconnect(struct usb_interface *intf) /* ATM finalize */ if (instance->atm_dev) - shutdown_atm_dev(instance->atm_dev); + atm_dev_deregister(instance->atm_dev); usbatm_put_instance(instance); /* taken in usbatm_usb_probe */ } |