Skip to content

Commit 6f56167

Browse files
committed
platform/x86/intel: vsec: Use intel_vsec_dev_release() to simplify init() error cleanup
On auxiliary_device_init(auxdev) failure we need to do the exact same cleanup steps as on device.release(), so use the intel_vsec_dev_release() callback for this. Signed-off-by: Hans de Goede <[email protected]> Reviewed-by: Andy Shevchenko <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent d908084 commit 6f56167

File tree

1 file changed

+1
-5
lines changed
  • drivers/platform/x86/intel

1 file changed

+1
-5
lines changed

drivers/platform/x86/intel/vsec.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -153,11 +153,7 @@ int intel_vsec_add_aux(struct pci_dev *pdev, struct device *parent,
153153

154154
ret = auxiliary_device_init(auxdev);
155155
if (ret < 0) {
156-
mutex_lock(&vsec_ida_lock);
157-
ida_free(intel_vsec_dev->ida, auxdev->id);
158-
mutex_unlock(&vsec_ida_lock);
159-
kfree(intel_vsec_dev->resource);
160-
kfree(intel_vsec_dev);
156+
intel_vsec_dev_release(&auxdev->dev);
161157
return ret;
162158
}
163159

0 commit comments

Comments
 (0)