projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
[powerpc.git]
/
drivers
/
bluetooth
/
hci_usb.c
diff --git
a/drivers/bluetooth/hci_usb.c
b/drivers/bluetooth/hci_usb.c
index
6756cb2
..
f510b25
100644
(file)
--- a/
drivers/bluetooth/hci_usb.c
+++ b/
drivers/bluetooth/hci_usb.c
@@
-875,13
+875,11
@@
static int hci_usb_probe(struct usb_interface *intf, const struct usb_device_id
goto done;
}
goto done;
}
- if (!(husb = k
m
alloc(sizeof(struct hci_usb), GFP_KERNEL))) {
+ if (!(husb = k
z
alloc(sizeof(struct hci_usb), GFP_KERNEL))) {
BT_ERR("Can't allocate: control structure");
goto done;
}
BT_ERR("Can't allocate: control structure");
goto done;
}
- memset(husb, 0, sizeof(struct hci_usb));
-
husb->udev = udev;
husb->bulk_out_ep = bulk_out_ep;
husb->bulk_in_ep = bulk_in_ep;
husb->udev = udev;
husb->bulk_out_ep = bulk_out_ep;
husb->bulk_in_ep = bulk_in_ep;