diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-30 13:27:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-30 13:27:16 -0700 |
| commit | 8188fc8bef8c677d28a9dbbd2db6deaee1644180 (patch) | |
| tree | 381c67b1e2957940a33fca26f9eac1c086ec1f29 /arch | |
| parent | 6da6c0db5316275015e8cc2959f12a17584aeb64 (diff) | |
| parent | 00ad691ab140b54ab9f5de5e74cb994f552e8124 (diff) | |
| download | linux-8188fc8bef8c677d28a9dbbd2db6deaee1644180.tar.gz linux-8188fc8bef8c677d28a9dbbd2db6deaee1644180.tar.bz2 linux-8188fc8bef8c677d28a9dbbd2db6deaee1644180.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
- Fixup license text for oradax driver, from Rob Gardner.
- Release device object with put_device() instead of straight kfree(),
from Arvind Yadav.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc: vio: use put_device() instead of kfree()
sparc64: Fix mistake in oradax license text
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sparc/include/uapi/asm/oradax.h | 2 | ||||
| -rw-r--r-- | arch/sparc/kernel/vio.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/include/uapi/asm/oradax.h b/arch/sparc/include/uapi/asm/oradax.h index 722951908b0a..4f6676fe4bcc 100644 --- a/arch/sparc/include/uapi/asm/oradax.h +++ b/arch/sparc/include/uapi/asm/oradax.h @@ -3,7 +3,7 @@ * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * the Free Software Foundation, either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, diff --git a/arch/sparc/kernel/vio.c b/arch/sparc/kernel/vio.c index 1a0fa10cb6b7..32bae68e34c1 100644 --- a/arch/sparc/kernel/vio.c +++ b/arch/sparc/kernel/vio.c @@ -403,7 +403,7 @@ static struct vio_dev *vio_create_one(struct mdesc_handle *hp, u64 mp, if (err) { printk(KERN_ERR "VIO: Could not register device %s, err=%d\n", dev_name(&vdev->dev), err); - kfree(vdev); + put_device(&vdev->dev); return NULL; } if (vdev->dp) |