diff options
| author | Chen-Yu Tsai <wens@csie.org> | 2021-01-18 04:01:07 +0100 |
|---|---|---|
| committer | Chen-Yu Tsai <wens@csie.org> | 2021-01-18 04:01:07 +0100 |
| commit | cabb33dd1db69a6ee8e06eaf190b494c52e0f945 (patch) | |
| tree | a7b405185f9ce6cd0eca73e6af9566cccccd85fb /drivers/bus | |
| parent | bus: sunxi-rsb: Implement runtime power management (diff) | |
| parent | mfd/bus: sunxi-rsb: Make .remove() callback return void (diff) | |
| download | linux-cabb33dd1db69a6ee8e06eaf190b494c52e0f945.tar.xz linux-cabb33dd1db69a6ee8e06eaf190b494c52e0f945.zip | |
Merge remote-tracking branch 'mfd/ib-mfd-bus-5.12' into sunxi/drivers-for-5.12
Diffstat (limited to 'drivers/bus')
| -rw-r--r-- | drivers/bus/sunxi-rsb.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/bus/sunxi-rsb.c b/drivers/bus/sunxi-rsb.c index ba5100dfc413..d46db132d085 100644 --- a/drivers/bus/sunxi-rsb.c +++ b/drivers/bus/sunxi-rsb.c @@ -173,7 +173,9 @@ static int sunxi_rsb_device_remove(struct device *dev) { const struct sunxi_rsb_driver *drv = to_sunxi_rsb_driver(dev->driver); - return drv->remove(to_sunxi_rsb_device(dev)); + drv->remove(to_sunxi_rsb_device(dev)); + + return 0; } static struct bus_type sunxi_rsb_bus = { |