Merge tag 'for-v3.8-merged' of git://git.infradead.org/battery-2.6
[~shefty/rdma-dev.git] / drivers / power / power_supply_core.c
index f984da1066ec3e49d4cd7ec7203294f1638b9f0c..8a7cfb3cc16694e7fdd4881d9bede20b7aaf4099 100644 (file)
@@ -201,7 +201,7 @@ static int psy_register_thermal(struct power_supply *psy)
        for (i = 0; i < psy->num_properties; i++) {
                if (psy->properties[i] == POWER_SUPPLY_PROP_TEMP) {
                        psy->tzd = thermal_zone_device_register(psy->name, 0, 0,
-                                       psy, &psy_tzd_ops, 0, 0);
+                                       psy, &psy_tzd_ops, NULL, 0, 0);
                        if (IS_ERR(psy->tzd))
                                return PTR_ERR(psy->tzd);
                        break;