diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-05-18 06:08:53 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-05-18 06:08:53 +0200 |
| commit | 1fafef9dfe127bdd4600eeaca302f0c1cb4ee5d0 (patch) | |
| tree | f829e8a26fc768666eb5f827bf5817892ea7e46c /drivers/hid/intel-ish-hid/ishtp/bus.c | |
| parent | drm: rcar-du: Fix build failure (diff) | |
| parent | drm: set FMODE_UNSIGNED_OFFSET for drm files (diff) | |
| download | linux-1fafef9dfe127bdd4600eeaca302f0c1cb4ee5d0.tar.xz linux-1fafef9dfe127bdd4600eeaca302f0c1cb4ee5d0.zip | |
Merge drm-fixes-for-v4.17-rc6-urgent into drm-next
Need to backmerge some nouveau fixes to reduce
the nouveau -next conflicts a lot.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/hid/intel-ish-hid/ishtp/bus.c')
| -rw-r--r-- | drivers/hid/intel-ish-hid/ishtp/bus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/intel-ish-hid/ishtp/bus.c b/drivers/hid/intel-ish-hid/ishtp/bus.c index f272cdd9bd55..2623a567ffba 100644 --- a/drivers/hid/intel-ish-hid/ishtp/bus.c +++ b/drivers/hid/intel-ish-hid/ishtp/bus.c @@ -418,7 +418,7 @@ static struct ishtp_cl_device *ishtp_bus_add_device(struct ishtp_device *dev, list_del(&device->device_link); spin_unlock_irqrestore(&dev->device_list_lock, flags); dev_err(dev->devc, "Failed to register ISHTP client device\n"); - kfree(device); + put_device(&device->dev); return NULL; } |