Merge tag 'tegra-for-6.19-core' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into soc/drivers
amba: Fixes for v6.19-rc1 Fix a device leak. Could go into v6.18 as a fix, but since this problem has existed for a long time and nobody has reported it before it doesn't seem critical enough and sufficient to get it into 6.19 and then backported. * tag 'tegra-for-6.19-core' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: amba: tegra-ahb: Fix device leak on SMMU enable Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
@@ -144,6 +144,7 @@ int tegra_ahb_enable_smmu(struct device_node *dn)
|
|||||||
if (!dev)
|
if (!dev)
|
||||||
return -EPROBE_DEFER;
|
return -EPROBE_DEFER;
|
||||||
ahb = dev_get_drvdata(dev);
|
ahb = dev_get_drvdata(dev);
|
||||||
|
put_device(dev);
|
||||||
val = gizmo_readl(ahb, AHB_ARBITRATION_XBAR_CTRL);
|
val = gizmo_readl(ahb, AHB_ARBITRATION_XBAR_CTRL);
|
||||||
val |= AHB_ARBITRATION_XBAR_CTRL_SMMU_INIT_DONE;
|
val |= AHB_ARBITRATION_XBAR_CTRL_SMMU_INIT_DONE;
|
||||||
gizmo_writel(ahb, val, AHB_ARBITRATION_XBAR_CTRL);
|
gizmo_writel(ahb, val, AHB_ARBITRATION_XBAR_CTRL);
|
||||||
|
|||||||
Reference in New Issue
Block a user