Skip to content

Commit 7456fea

Browse files
Uwe Kleine-Königalexandrebelloni
authored andcommitted
i3c: Handle drivers without probe or remove callback
A registered driver without a probe callback doesn't make sense, so refuse to register such a driver. (Otherwise i3c_device_probe() yields a NULL pointer exception.) A driver without remove is possible, e.g. when all resources are freed using devm callbacks. So guard the call to driver->remove by a check for being non-NULL. Note that the only in-tree i3c driver (drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i3c.c) doesn't have a remove callback. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Link: https://lore.kernel.org/r/20210128091048.17006-1-u.kleine-koenig@pengutronix.de
1 parent 9d909f1 commit 7456fea

2 files changed

Lines changed: 11 additions & 4 deletions

File tree

drivers/i3c/device.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,11 @@ int i3c_driver_register_with_owner(struct i3c_driver *drv, struct module *owner)
262262
drv->driver.owner = owner;
263263
drv->driver.bus = &i3c_bus_type;
264264

265+
if (!drv->probe) {
266+
pr_err("Trying to register an i3c driver without probe callback\n");
267+
return -EINVAL;
268+
}
269+
265270
return driver_register(&drv->driver);
266271
}
267272
EXPORT_SYMBOL_GPL(i3c_driver_register_with_owner);

drivers/i3c/master.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -326,11 +326,13 @@ static int i3c_device_remove(struct device *dev)
326326
{
327327
struct i3c_device *i3cdev = dev_to_i3cdev(dev);
328328
struct i3c_driver *driver = drv_to_i3cdrv(dev->driver);
329-
int ret;
329+
int ret = 0;
330330

331-
ret = driver->remove(i3cdev);
332-
if (ret)
333-
return ret;
331+
if (driver->remove) {
332+
ret = driver->remove(i3cdev);
333+
if (ret)
334+
return ret;
335+
}
334336

335337
i3c_device_free_ibi(i3cdev);
336338

0 commit comments

Comments
 (0)