diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/backlight.h | 6 | ||||
| -rw-r--r-- | include/linux/lcd.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/backlight.h b/include/linux/backlight.h index d1426b852bdf..43c6d55644b5 100644 --- a/include/linux/backlight.h +++ b/include/linux/backlight.h | |||
| @@ -14,8 +14,8 @@ | |||
| 14 | 14 | ||
| 15 | /* Notes on locking: | 15 | /* Notes on locking: |
| 16 | * | 16 | * |
| 17 | * backlight_device->sem is an internal backlight lock protecting the props | 17 | * backlight_device->props_lock is an internal backlight lock protecting the |
| 18 | * field and no code outside the core should need to touch it. | 18 | * props field and no code outside the core should need to touch it. |
| 19 | * | 19 | * |
| 20 | * Access to update_status() is serialised by the update_lock mutex since | 20 | * Access to update_status() is serialised by the update_lock mutex since |
| 21 | * most drivers seem to need this and historically get it wrong. | 21 | * most drivers seem to need this and historically get it wrong. |
| @@ -57,7 +57,7 @@ struct backlight_device { | |||
| 57 | /* This protects the 'props' field. If 'props' is NULL, the driver that | 57 | /* This protects the 'props' field. If 'props' is NULL, the driver that |
| 58 | registered this device has been unloaded, and if class_get_devdata() | 58 | registered this device has been unloaded, and if class_get_devdata() |
| 59 | points to something in the body of that driver, it is also invalid. */ | 59 | points to something in the body of that driver, it is also invalid. */ |
| 60 | struct semaphore sem; | 60 | struct mutex props_lock; |
| 61 | /* If this is NULL, the backing module is unloaded */ | 61 | /* If this is NULL, the backing module is unloaded */ |
| 62 | struct backlight_properties *props; | 62 | struct backlight_properties *props; |
| 63 | /* Serialise access to update_status method */ | 63 | /* Serialise access to update_status method */ |
diff --git a/include/linux/lcd.h b/include/linux/lcd.h index bfbf6552eb51..46970af2ca89 100644 --- a/include/linux/lcd.h +++ b/include/linux/lcd.h | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | 14 | ||
| 15 | /* Notes on locking: | 15 | /* Notes on locking: |
| 16 | * | 16 | * |
| 17 | * lcd_device->sem is an internal backlight lock protecting the props | 17 | * lcd_device->props_lock is an internal backlight lock protecting the props |
| 18 | * field and no code outside the core should need to touch it. | 18 | * field and no code outside the core should need to touch it. |
| 19 | * | 19 | * |
| 20 | * Access to set_power() is serialised by the update_lock mutex since | 20 | * Access to set_power() is serialised by the update_lock mutex since |
| @@ -52,7 +52,7 @@ struct lcd_device { | |||
| 52 | /* This protects the 'props' field. If 'props' is NULL, the driver that | 52 | /* This protects the 'props' field. If 'props' is NULL, the driver that |
| 53 | registered this device has been unloaded, and if class_get_devdata() | 53 | registered this device has been unloaded, and if class_get_devdata() |
| 54 | points to something in the body of that driver, it is also invalid. */ | 54 | points to something in the body of that driver, it is also invalid. */ |
| 55 | struct semaphore sem; | 55 | struct mutex props_lock; |
| 56 | /* If this is NULL, the backing module is unloaded */ | 56 | /* If this is NULL, the backing module is unloaded */ |
| 57 | struct lcd_properties *props; | 57 | struct lcd_properties *props; |
| 58 | /* Serialise access to set_power method */ | 58 | /* Serialise access to set_power method */ |