diff options
| author | Andi Shyti <andi.shyti@kernel.org> | 2026-07-25 00:49:54 +0200 |
|---|---|---|
| committer | Andi Shyti <andi.shyti@kernel.org> | 2026-07-25 00:49:54 +0200 |
| commit | 270f77bc9a0ac08e32002a29843ab077167bf024 (patch) | |
| tree | 06184c3984153db63d27677c28624b0451ee1660 | |
| parent | c844ed7266c9d9d2663f34cfa32d4f66ea3a9119 (diff) | |
| parent | e26e82b04ffdd60d44f2e64db1495855b78e3083 (diff) | |
| download | linux-next-270f77bc9a0ac08e32002a29843ab077167bf024.tar.gz linux-next-270f77bc9a0ac08e32002a29843ab077167bf024.zip | |
Merge branch 'i2c/i2c-fixes' into i2c/i2c-next
| -rw-r--r-- | drivers/i2c/busses/i2c-k1.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/i2c/busses/i2c-k1.c b/drivers/i2c/busses/i2c-k1.c index 487f23fde725..ee75eee15c10 100644 --- a/drivers/i2c/busses/i2c-k1.c +++ b/drivers/i2c/busses/i2c-k1.c @@ -854,11 +854,6 @@ static int spacemit_i2c_probe(struct platform_device *pdev) if (i2c->irq < 0) return dev_err_probe(dev, i2c->irq, "failed to get irq resource"); - ret = devm_request_irq(i2c->dev, i2c->irq, spacemit_i2c_irq_handler, - IRQF_NO_SUSPEND, dev_name(i2c->dev), i2c); - if (ret) - return dev_err_probe(dev, ret, "failed to request irq"); - clk = devm_clk_get_enabled(dev, "func"); if (IS_ERR(clk)) return dev_err_probe(dev, PTR_ERR(clk), "failed to enable func clock"); @@ -908,6 +903,11 @@ static int spacemit_i2c_probe(struct platform_device *pdev) init_completion(&i2c->complete); + ret = devm_request_irq(i2c->dev, i2c->irq, spacemit_i2c_irq_handler, + IRQF_NO_SUSPEND, dev_name(i2c->dev), i2c); + if (ret) + return dev_err_probe(dev, ret, "failed to request irq"); + platform_set_drvdata(pdev, i2c); ret = i2c_add_numbered_adapter(&i2c->adapt); |