Skip to content

Commit ce28dae

Browse files
author
Benjamin Tissoires
committed
Merge branch 'for-6.12/picolcd' into for-linus
- Use backlight power constants (Thomas Zimmermann)
2 parents c9ce596 + 28a7eeb commit ce28dae

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

drivers/hid/hid-picolcd_backlight.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ static int picolcd_set_brightness(struct backlight_device *bdev)
3131
data->lcd_brightness = bdev->props.brightness & 0x0ff;
3232
data->lcd_power = bdev->props.power;
3333
spin_lock_irqsave(&data->lock, flags);
34-
hid_set_field(report->field[0], 0, data->lcd_power == FB_BLANK_UNBLANK ? data->lcd_brightness : 0);
34+
hid_set_field(report->field[0], 0,
35+
data->lcd_power == BACKLIGHT_POWER_ON ? data->lcd_brightness : 0);
3536
if (!(data->status & PICOLCD_FAILED))
3637
hid_hw_request(data->hdev, report, HID_REQ_SET_REPORT);
3738
spin_unlock_irqrestore(&data->lock, flags);
@@ -94,7 +95,7 @@ void picolcd_suspend_backlight(struct picolcd_data *data)
9495
if (!data->backlight)
9596
return;
9697

97-
data->backlight->props.power = FB_BLANK_POWERDOWN;
98+
data->backlight->props.power = BACKLIGHT_POWER_OFF;
9899
picolcd_set_brightness(data->backlight);
99100
data->lcd_power = data->backlight->props.power = bl_power;
100101
}

0 commit comments

Comments
 (0)