projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'v3.10.107' into update
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
drivers
/
net
/
can
/
usb
/
usb_8dev.c
diff --git
a/drivers/net/can/usb/usb_8dev.c
b/drivers/net/can/usb/usb_8dev.c
index cbd388eea68271c8ab7eaa2581ffb9145a4be429..f8b84fed537bb5e69b0d6cf9952faeb95c44ed73 100644
(file)
--- a/
drivers/net/can/usb/usb_8dev.c
+++ b/
drivers/net/can/usb/usb_8dev.c
@@
-956,8
+956,8
@@
static int usb_8dev_probe(struct usb_interface *intf,
for (i = 0; i < MAX_TX_URBS; i++)
priv->tx_contexts[i].echo_index = MAX_TX_URBS;
for (i = 0; i < MAX_TX_URBS; i++)
priv->tx_contexts[i].echo_index = MAX_TX_URBS;
- priv->cmd_msg_buffer =
kzalloc(
sizeof(struct usb_8dev_cmd_msg),
- GFP_KERNEL);
+ priv->cmd_msg_buffer =
devm_kzalloc(&intf->dev,
sizeof(struct usb_8dev_cmd_msg),
+
GFP_KERNEL);
if (!priv->cmd_msg_buffer)
goto cleanup_candev;
if (!priv->cmd_msg_buffer)
goto cleanup_candev;
@@
-971,7
+971,7
@@
static int usb_8dev_probe(struct usb_interface *intf,
if (err) {
netdev_err(netdev,
"couldn't register CAN device: %d\n", err);
if (err) {
netdev_err(netdev,
"couldn't register CAN device: %d\n", err);
- goto cleanup_c
md_msg_buffer
;
+ goto cleanup_c
andev
;
}
err = usb_8dev_cmd_version(priv, &version);
}
err = usb_8dev_cmd_version(priv, &version);
@@
-992,9
+992,6
@@
static int usb_8dev_probe(struct usb_interface *intf,
cleanup_unregister_candev:
unregister_netdev(priv->netdev);
cleanup_unregister_candev:
unregister_netdev(priv->netdev);
-cleanup_cmd_msg_buffer:
- kfree(priv->cmd_msg_buffer);
-
cleanup_candev:
free_candev(netdev);
cleanup_candev:
free_candev(netdev);