|
@@ -197,12 +197,12 @@ static int backlight_suspend(struct device *dev, pm_message_t state)
|
|
{
|
|
{
|
|
struct backlight_device *bd = to_backlight_device(dev);
|
|
struct backlight_device *bd = to_backlight_device(dev);
|
|
|
|
|
|
- if (bd->ops->options & BL_CORE_SUSPENDRESUME) {
|
|
|
|
- mutex_lock(&bd->ops_lock);
|
|
|
|
|
|
+ mutex_lock(&bd->ops_lock);
|
|
|
|
+ if (bd->ops && bd->ops->options & BL_CORE_SUSPENDRESUME) {
|
|
bd->props.state |= BL_CORE_SUSPENDED;
|
|
bd->props.state |= BL_CORE_SUSPENDED;
|
|
backlight_update_status(bd);
|
|
backlight_update_status(bd);
|
|
- mutex_unlock(&bd->ops_lock);
|
|
|
|
}
|
|
}
|
|
|
|
+ mutex_unlock(&bd->ops_lock);
|
|
|
|
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
@@ -211,12 +211,12 @@ static int backlight_resume(struct device *dev)
|
|
{
|
|
{
|
|
struct backlight_device *bd = to_backlight_device(dev);
|
|
struct backlight_device *bd = to_backlight_device(dev);
|
|
|
|
|
|
- if (bd->ops->options & BL_CORE_SUSPENDRESUME) {
|
|
|
|
- mutex_lock(&bd->ops_lock);
|
|
|
|
|
|
+ mutex_lock(&bd->ops_lock);
|
|
|
|
+ if (bd->ops && bd->ops->options & BL_CORE_SUSPENDRESUME) {
|
|
bd->props.state &= ~BL_CORE_SUSPENDED;
|
|
bd->props.state &= ~BL_CORE_SUSPENDED;
|
|
backlight_update_status(bd);
|
|
backlight_update_status(bd);
|
|
- mutex_unlock(&bd->ops_lock);
|
|
|
|
}
|
|
}
|
|
|
|
+ mutex_unlock(&bd->ops_lock);
|
|
|
|
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|