diff options
| author | Greg Kroah-Hartman | 2014-02-08 22:38:28 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-02-08 22:38:28 +0100 |
| commit | 7ca363f6872bede71e486352885de3a88f4a3967 (patch) | |
| tree | 75d334cd41bfdd5c9c6c49cb58c1301adfbe3903 /drivers/staging/usbip | |
| parent | Staging: ozwpan: Change kmalloc() to kzalloc() (diff) | |
| parent | Merge tag 'iio-fixes-for-3.14b' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| download | kernel-qcow2-linux-7ca363f6872bede71e486352885de3a88f4a3967.tar.gz kernel-qcow2-linux-7ca363f6872bede71e486352885de3a88f4a3967.tar.xz kernel-qcow2-linux-7ca363f6872bede71e486352885de3a88f4a3967.zip | |
Merge branch 'staging-linus' into staging-work
This is to pull in the lustre fixes so that others can continue to work
on updating the lustre codebase, as well as resolve some merge issues
with the ion and ocproto drivers to keep linux-next happy.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/usbip')
| -rw-r--r-- | drivers/staging/usbip/userspace/libsrc/names.c | 8 | ||||
| -rw-r--r-- | drivers/staging/usbip/vhci_sysfs.c | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/drivers/staging/usbip/userspace/libsrc/names.c b/drivers/staging/usbip/userspace/libsrc/names.c index 3c8d28b771e0..81ff8522405c 100644 --- a/drivers/staging/usbip/userspace/libsrc/names.c +++ b/drivers/staging/usbip/userspace/libsrc/names.c @@ -169,14 +169,14 @@ static void *my_malloc(size_t size) struct pool *p; p = calloc(1, sizeof(struct pool)); - if (!p) { - free(p); + if (!p) return NULL; - } p->mem = calloc(1, size); - if (!p->mem) + if (!p->mem) { + free(p); return NULL; + } p->next = pool_head; pool_head = p; diff --git a/drivers/staging/usbip/vhci_sysfs.c b/drivers/staging/usbip/vhci_sysfs.c index 742309222103..03e6edf46e7c 100644 --- a/drivers/staging/usbip/vhci_sysfs.c +++ b/drivers/staging/usbip/vhci_sysfs.c @@ -149,7 +149,8 @@ static int valid_args(__u32 rhport, enum usb_device_speed speed) case USB_SPEED_WIRELESS: break; default: - pr_err("speed %d\n", speed); + pr_err("Failed attach request for unsupported USB speed: %s\n", + usb_speed_string(speed)); return -EINVAL; } |