UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

intel_th: Fix a double put_device() in error path 

Commit a753bfcfdb ("intel_th: Make the switch allocate its subdevices")
factored out intel_th_subdevice_alloc() from intel_th_populate(), but got
the error path wrong, resulting in two instances of a double put_device()
on a freshly initialized, but not 'added' device.

Fix this by only doing one put_device() in the error path.

Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Fixes: a753bfcfdb ("intel_th: Make the switch allocate its subdevices")
Reported-by: Wen Yang <wenyang@linux.alibaba.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: stable@vger.kernel.org # v4.14+
Link: https://lore.kernel.org/r/20191120130806.44028-2-alexander.shishkin@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Alexander Shishkin 2019-11-20 15:08:04 +02:00 committed by Greg Kroah-Hartman
parent 9a5d847c0b
commit 512592779a
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/hwtracing/intel_th/core.c
View File

@ -649,10 +649,8 @@ intel_th_subdevice_alloc(struct intel_th *th,
} }
err = intel_th_device_add_resources(thdev, res, subdev->nres); err = intel_th_device_add_resources(thdev, res, subdev->nres);
if (err) { if (err)
put_device(&thdev->dev);
goto fail_put_device; goto fail_put_device;
}
if (subdev->type == INTEL_TH_OUTPUT) { if (subdev->type == INTEL_TH_OUTPUT) {
if (subdev->mknode) if (subdev->mknode)
@ -667,10 +665,8 @@ intel_th_subdevice_alloc(struct intel_th *th,
} }
err = device_add(&thdev->dev); err = device_add(&thdev->dev);
if (err) { if (err)
put_device(&thdev->dev);
goto fail_free_res; goto fail_free_res;
}
/* need switch driver to be loaded to enumerate the rest */ /* need switch driver to be loaded to enumerate the rest */
if (subdev->type == INTEL_TH_SWITCH && !req) { if (subdev->type == INTEL_TH_SWITCH && !req) {