mod_delayed_work(system_wq, &di->work, HZ / 2);
 }
 
+static void bq27xxx_battery_mutex_destroy(void *data)
+{
+       struct mutex *lock = data;
+
+       mutex_destroy(lock);
+}
+
 int bq27xxx_battery_setup(struct bq27xxx_device_info *di)
 {
        struct power_supply_desc *psy_desc;
                .of_node = di->dev->of_node,
                .drv_data = di,
        };
+       int ret;
 
        INIT_DELAYED_WORK(&di->work, bq27xxx_battery_poll);
        mutex_init(&di->lock);
+       ret = devm_add_action_or_reset(di->dev, bq27xxx_battery_mutex_destroy,
+                                      &di->lock);
+       if (ret)
+               return ret;
 
        di->regs       = bq27xxx_chip_data[di->chip].regs;
        di->unseal_key = bq27xxx_chip_data[di->chip].unseal_key;
        cancel_delayed_work_sync(&di->work);
 
        power_supply_unregister(di->bat);
-       mutex_destroy(&di->lock);
 }
 EXPORT_SYMBOL_GPL(bq27xxx_battery_teardown);