Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
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()
+3
-1
drivers/i2c/busses/i2c-designware-pcidrv.c
+3
-1
drivers/i2c/busses/i2c-designware-pcidrv.c
···
278
279
if ((dev->flags & MODEL_MASK) == MODEL_AMD_NAVI_GPU) {
280
dev->slave = i2c_new_ccgx_ucsi(&dev->adapter, dev->irq, &dgpu_node);
281
-
if (IS_ERR(dev->slave))
282
return dev_err_probe(device, PTR_ERR(dev->slave),
283
"register UCSI failed\n");
284
}
285
286
pm_runtime_set_autosuspend_delay(device, 1000);
···
278
279
if ((dev->flags & MODEL_MASK) == MODEL_AMD_NAVI_GPU) {
280
dev->slave = i2c_new_ccgx_ucsi(&dev->adapter, dev->irq, &dgpu_node);
281
+
if (IS_ERR(dev->slave)) {
282
+
i2c_del_adapter(&dev->adapter);
283
return dev_err_probe(device, PTR_ERR(dev->slave),
284
"register UCSI failed\n");
285
+
}
286
}
287
288
pm_runtime_set_autosuspend_delay(device, 1000);