| Message ID | 20240325123444.3031851-7-andriy.shevchenko@linux.intel.com |
|---|---|
| State | Accepted |
| Commit | 602401e32847f90c513df4a34bcac4dd6b02dd8d |
| Headers | show |
| Series | ACPI: scan: A few ad-hoc cleanups | expand |
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index b2785a036a68..45f7ec3b6548 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1579,12 +1579,13 @@ int acpi_iommu_fwspec_init(struct device *dev, u32 id, struct fwnode_handle *fwnode, const struct iommu_ops *ops) { - int ret = iommu_fwspec_init(dev, fwnode, ops); + int ret; - if (!ret) - ret = iommu_fwspec_add_ids(dev, &id, 1); + ret = iommu_fwspec_init(dev, fwnode, ops); + if (ret) + return ret; - return ret; + return iommu_fwspec_add_ids(dev, &id, 1); } static inline const struct iommu_ops *acpi_iommu_fwspec_ops(struct device *dev)
Check for an error and return it as it's the usual way to handle this. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/acpi/scan.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)