diff options
| author | Frederic Weisbecker | 2009-10-18 01:09:09 +0200 |
|---|---|---|
| committer | Frederic Weisbecker | 2009-10-18 01:12:33 +0200 |
| commit | 0f8f86c7bdd1c954fbe153af437a0d91a6c5721a (patch) | |
| tree | 94a8d419a470a4f9852ca397bb9bbe48db92ff5c /drivers/staging/usbip/stub_main.c | |
| parent | Merge branch 'linus' into tracing/hw-breakpoints (diff) | |
| parent | perf tools: Move dereference after NULL test (diff) | |
| download | kernel-qcow2-linux-0f8f86c7bdd1c954fbe153af437a0d91a6c5721a.tar.gz kernel-qcow2-linux-0f8f86c7bdd1c954fbe153af437a0d91a6c5721a.tar.xz kernel-qcow2-linux-0f8f86c7bdd1c954fbe153af437a0d91a6c5721a.zip | |
Merge commit 'perf/core' into perf/hw-breakpoint
Conflicts:
kernel/Makefile
kernel/trace/Makefile
kernel/trace/trace.h
samples/Makefile
Merge reason: We need to be uptodate with the perf events development
branch because we plan to rewrite the breakpoints API on top of
perf events.
Diffstat (limited to 'drivers/staging/usbip/stub_main.c')
| -rw-r--r-- | drivers/staging/usbip/stub_main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/usbip/stub_main.c b/drivers/staging/usbip/stub_main.c index 05e4c6064390..ba1678fa6311 100644 --- a/drivers/staging/usbip/stub_main.c +++ b/drivers/staging/usbip/stub_main.c @@ -145,14 +145,14 @@ static ssize_t store_match_busid(struct device_driver *dev, const char *buf, if (add_match_busid(busid) < 0) return -ENOMEM; else { - udbg("add busid %s\n", busid); + usbip_udbg("add busid %s\n", busid); return count; } } else if (!strncmp(buf, "del ", 4)) { if (del_match_busid(busid) < 0) return -ENODEV; else { - udbg("del busid %s\n", busid); + usbip_udbg("del busid %s\n", busid); return count; } } else @@ -213,12 +213,12 @@ void stub_device_cleanup_urbs(struct stub_device *sdev) { struct stub_priv *priv; - udbg("free sdev %p\n", sdev); + usbip_udbg("free sdev %p\n", sdev); while ((priv = stub_priv_pop(sdev))) { struct urb *urb = priv->urb; - udbg(" free urb %p\n", urb); + usbip_udbg(" free urb %p\n", urb); usb_kill_urb(urb); kmem_cache_free(stub_priv_cache, priv); |