projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] cciss: fix for deregister_disk
[powerpc.git]
/
drivers
/
usb
/
atm
/
usbatm.c
diff --git
a/drivers/usb/atm/usbatm.c
b/drivers/usb/atm/usbatm.c
index
bb1db19
..
2e6593e
100644
(file)
--- 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;
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;
}
return ret;
}
@@
-960,7
+960,7
@@
int usbatm_usb_probe(struct usb_interface *intf, const struct usb_device_id *id,
intf->altsetting->desc.bInterfaceNumber);
/* instance init */
intf->altsetting->desc.bInterfaceNumber);
/* instance init */
- instance = k
calloc(1,
sizeof(*instance) + sizeof(struct urb *) * (num_rcv_urbs + num_snd_urbs), GFP_KERNEL);
+ instance = k
zalloc(
sizeof(*instance) + sizeof(struct urb *) * (num_rcv_urbs + num_snd_urbs), GFP_KERNEL);
if (!instance) {
dev_dbg(dev, "%s: no memory for instance data!\n", __func__);
return -ENOMEM;
if (!instance) {
dev_dbg(dev, "%s: no memory for instance data!\n", __func__);
return -ENOMEM;
@@
-1164,7
+1164,7
@@
void usbatm_usb_disconnect(struct usb_interface *intf)
/* ATM finalize */
if (instance->atm_dev)
/* 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 */
}
usbatm_put_instance(instance); /* taken in usbatm_usb_probe */
}