diff options
| author | Greg Kroah-Hartman | 2018-05-08 09:47:16 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2018-05-08 09:47:16 +0200 |
| commit | 58318cd4df415aaeaad1a7306cf1d35dad9a21c3 (patch) | |
| tree | 794fef2338813360e0f535511f7d6f97a08254f0 /arch/sparc/kernel/vio.c | |
| parent | dcadfaf2127e067e87843ff688f4ae5674a8d607 (diff) | |
| parent | 75bc37fefc4471e718ba8e651aa74673d4e0a9eb (diff) | |
Merge 4.17-rc4 into usb-next
We want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/sparc/kernel/vio.c')
| -rw-r--r-- | arch/sparc/kernel/vio.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) |