aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/linux/backlight.h6
-rw-r--r--include/linux/lcd.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/backlight.h b/include/linux/backlight.h
index d1426b852bd..43c6d55644b 100644
--- a/include/linux/backlight.h
+++ b/include/linux/backlight.h
@@ -14,8 +14,8 @@
/* Notes on locking:
*
- * backlight_device->sem is an internal backlight lock protecting the props
- * field and no code outside the core should need to touch it.
+ * backlight_device->props_lock is an internal backlight lock protecting the
+ * props field and no code outside the core should need to touch it.
*
* Access to update_status() is serialised by the update_lock mutex since
* most drivers seem to need this and historically get it wrong.
@@ -57,7 +57,7 @@ struct backlight_device {
/* This protects the 'props' field. If 'props' is NULL, the driver that
registered this device has been unloaded, and if class_get_devdata()
points to something in the body of that driver, it is also invalid. */
- struct semaphore sem;
+ struct mutex props_lock;
/* If this is NULL, the backing module is unloaded */
struct backlight_properties *props;
/* Serialise access to update_status method */
diff --git a/include/linux/lcd.h b/include/linux/lcd.h
index bfbf6552eb5..46970af2ca8 100644
--- a/include/linux/lcd.h
+++ b/include/linux/lcd.h
@@ -14,7 +14,7 @@
/* Notes on locking:
*
- * lcd_device->sem is an internal backlight lock protecting the props
+ * lcd_device->props_lock is an internal backlight lock protecting the props
* field and no code outside the core should need to touch it.
*
* Access to set_power() is serialised by the update_lock mutex since
@@ -52,7 +52,7 @@ struct lcd_device {
/* This protects the 'props' field. If 'props' is NULL, the driver that
registered this device has been unloaded, and if class_get_devdata()
points to something in the body of that driver, it is also invalid. */
- struct semaphore sem;
+ struct mutex props_lock;
/* If this is NULL, the backing module is unloaded */
struct lcd_properties *props;
/* Serialise access to set_power method */