diff options
| author | Andi Shyti <andi.shyti@kernel.org> | 2026-08-19 08:52:34 +0200 |
|---|---|---|
| committer | Andi Shyti <andi.shyti@kernel.org> | 2026-08-19 08:52:34 +0200 |
| commit | fc62b3634860a4e2f14f9d6b3fe606540d4538bc (patch) | |
| tree | 703025930c74f882d1b5c2ec6bd90e14d26eeac8 | |
| parent | 0a7e4eca8fbb9e4c5a64b02fe4018751b7242885 (diff) | |
| parent | 67db795c498c273851c2be081a45bbe535141046 (diff) | |
| download | linux-next-fc62b3634860a4e2f14f9d6b3fe606540d4538bc.tar.gz linux-next-fc62b3634860a4e2f14f9d6b3fe606540d4538bc.zip | |
Merge branch 'i2c/i2c-2' into i2c/i2c-next
| -rw-r--r-- | drivers/i2c/busses/i2c-mxs.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/i2c/busses/i2c-mxs.c b/drivers/i2c/busses/i2c-mxs.c index 4e07babea9c3..eee4fdcd9df3 100644 --- a/drivers/i2c/busses/i2c-mxs.c +++ b/drivers/i2c/busses/i2c-mxs.c @@ -839,7 +839,7 @@ static int mxs_i2c_probe(struct platform_device *pdev) } /* Setup the DMA */ - i2c->dmach = dma_request_chan(dev, "rx-tx"); + i2c->dmach = devm_dma_request_chan(dev, "rx-tx"); if (IS_ERR(i2c->dmach)) { return dev_err_probe(dev, PTR_ERR(i2c->dmach), "Failed to request dma\n"); @@ -877,9 +877,6 @@ static void mxs_i2c_remove(struct platform_device *pdev) i2c_del_adapter(&i2c->adapter); - if (i2c->dmach) - dma_release_channel(i2c->dmach); - writel(MXS_I2C_CTRL0_SFTRST, i2c->regs + MXS_I2C_CTRL0_SET); } |