提交 aa5d849b 编写于 作者: A Alexander Shishkin 提交者: Greg Kroah-Hartman

intel_th: Fix a double put_device() in error path

commit 512592779a337feb5905d8fcf9498dbf33672d4a upstream.

Commit a753bfcf ("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: NAlexander Shishkin <alexander.shishkin@linux.intel.com>
Fixes: a753bfcf ("intel_th: Make the switch allocate its subdevices")
Reported-by: NWen Yang <wenyang@linux.alibaba.com>
Reviewed-by: NAndy 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.comSigned-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 b56d00ac
...@@ -629,10 +629,8 @@ intel_th_subdevice_alloc(struct intel_th *th, ...@@ -629,10 +629,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) {
thdev->dev.devt = MKDEV(th->major, th->num_thdevs); thdev->dev.devt = MKDEV(th->major, th->num_thdevs);
...@@ -646,10 +644,8 @@ intel_th_subdevice_alloc(struct intel_th *th, ...@@ -646,10 +644,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) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册