Merge "thermal-core: Add a lock to tz_notify_trip()"

	mutex_unlock(&sensor->lock);

}

/* May be called in an interrupt context.

/* Should not be called in an interrupt context.

 * Do NOT call sensor_set_trip from this function

 */

int thermal_sensor_trip(struct thermal_zone_device *tz,

	if (list_empty(&tz->sensor.threshold_list))

		return 0;

	mutex_lock(&tz->sensor.lock);

	list_for_each_entry_safe(pos, var, &tz->sensor.threshold_list, list) {

		if ((pos->trip != trip) || (!pos->active))

			continue;

		}

	}

	mutex_unlock(&tz->sensor.lock);

	schedule_work(&tz->sensor.work);

	return ret;