diff options
| author | Daiane Angolini <daiane.angolini@foundries.io> | 2022-11-08 16:35:18 -0300 |
|---|---|---|
| committer | Daiane Angolini <daiane.angolini@foundries.io> | 2022-11-08 16:35:18 -0300 |
| commit | 28f04363b04142c45f8a29d0c32e21b060975e90 (patch) | |
| tree | 8578cfe035db9bd4b78a0c504512c5e7f89a96cb /drivers/spi/spi-dw-bt1.c | |
| parent | 7540d075c97713a4366a00b5c928261436b93d2d (diff) | |
| parent | bd8a595958a5b02e58cdd6fed82d4ebc77b1988a (diff) | |
Merge tag 'v5.15.75' into 5.15-2.1.x-imx
This is the 5.15.75 stable release
Conflicts:
arch/arm/boot/dts/imx6dl.dtsi
arch/arm/boot/dts/imx6q.dtsi
arch/arm/boot/dts/imx6sl.dtsi
arch/arm/boot/dts/imx6sll.dtsi
arch/arm/boot/dts/imx6sx.dtsi
arch/arm/boot/dts/imx7d-sdb.dts
drivers/char/hw_random/imx-rngc.c
drivers/dma/mxs-dma.c
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
drivers/tty/serial/fsl_lpuart.c
drivers/usb/host/xhci.h
Signed-off-by: Daiane Angolini <daiane.angolini@foundries.io>
Diffstat (limited to 'drivers/spi/spi-dw-bt1.c')
| -rw-r--r-- | drivers/spi/spi-dw-bt1.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/spi/spi-dw-bt1.c b/drivers/spi/spi-dw-bt1.c index 5be6b7b80c21..7e3ff54f6616 100644 --- a/drivers/spi/spi-dw-bt1.c +++ b/drivers/spi/spi-dw-bt1.c @@ -293,8 +293,10 @@ static int dw_spi_bt1_probe(struct platform_device *pdev) pm_runtime_enable(&pdev->dev); ret = dw_spi_add_host(&pdev->dev, dws); - if (ret) + if (ret) { + pm_runtime_disable(&pdev->dev); goto err_disable_clk; + } platform_set_drvdata(pdev, dwsbt1); |