Skip to content

Commit a1317e1

Browse files
committed
Merge tag 'i2c-for-6.15-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fix from Wolfram Sang: - designware: cleanup properly on probe failure * tag 'i2c-for-6.15-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: i2c: designware: Fix an error handling path in i2c_dw_pci_probe()
2 parents 172a9d9 + 6c72fc5 commit a1317e1

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

drivers/i2c/busses/i2c-designware-pcidrv.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,9 +278,11 @@ static int i2c_dw_pci_probe(struct pci_dev *pdev,
278278

279279
if ((dev->flags & MODEL_MASK) == MODEL_AMD_NAVI_GPU) {
280280
dev->slave = i2c_new_ccgx_ucsi(&dev->adapter, dev->irq, &dgpu_node);
281-
if (IS_ERR(dev->slave))
281+
if (IS_ERR(dev->slave)) {
282+
i2c_del_adapter(&dev->adapter);
282283
return dev_err_probe(device, PTR_ERR(dev->slave),
283284
"register UCSI failed\n");
285+
}
284286
}
285287

286288
pm_runtime_set_autosuspend_delay(device, 1000);

0 commit comments

Comments
 (0)