diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
| commit | 64e47488c913ac704d465a6af86a26786d1412a5 (patch) | |
| tree | d3b0148592963dcde26e4bb35ddfec8b1eaf8e23 /drivers/usb/host/ehci-sched.c | |
| parent | 4a35a46bf1cda4737c428380d1db5d15e2590d18 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge linux-2.6 with linux-acpi-2.6
Diffstat (limited to 'drivers/usb/host/ehci-sched.c')
| -rw-r--r-- | drivers/usb/host/ehci-sched.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-sched.c b/drivers/usb/host/ehci-sched.c index b56f25864ed6..4c972b57c7c3 100644 --- a/drivers/usb/host/ehci-sched.c +++ b/drivers/usb/host/ehci-sched.c | |||
| @@ -638,7 +638,7 @@ iso_stream_alloc (unsigned mem_flags) | |||
| 638 | { | 638 | { |
| 639 | struct ehci_iso_stream *stream; | 639 | struct ehci_iso_stream *stream; |
| 640 | 640 | ||
| 641 | stream = kcalloc(1, sizeof *stream, mem_flags); | 641 | stream = kzalloc(sizeof *stream, mem_flags); |
| 642 | if (likely (stream != NULL)) { | 642 | if (likely (stream != NULL)) { |
| 643 | INIT_LIST_HEAD(&stream->td_list); | 643 | INIT_LIST_HEAD(&stream->td_list); |
| 644 | INIT_LIST_HEAD(&stream->free_list); | 644 | INIT_LIST_HEAD(&stream->free_list); |