Commit 0c99ee44 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'tag-chrome-platform-fixes-for-v5.5-rc7' of...

Merge tag 'tag-chrome-platform-fixes-for-v5.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux

Pull chrome platform fix from Benson Leung:
 "One fix in the wilco_ec keyboard backlight driver to allow the EC
  driver to continue loading in the absence of a backlight module"

* tag 'tag-chrome-platform-fixes-for-v5.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux:
  platform/chrome: wilco_ec: Fix keyboard backlight probing
parents f5ae2ea6 dfb9a885
...@@ -73,13 +73,6 @@ static int send_kbbl_msg(struct wilco_ec_device *ec, ...@@ -73,13 +73,6 @@ static int send_kbbl_msg(struct wilco_ec_device *ec,
return ret; return ret;
} }
if (response->status) {
dev_err(ec->dev,
"EC reported failure sending keyboard LEDs command: %d",
response->status);
return -EIO;
}
return 0; return 0;
} }
...@@ -87,6 +80,7 @@ static int set_kbbl(struct wilco_ec_device *ec, enum led_brightness brightness) ...@@ -87,6 +80,7 @@ static int set_kbbl(struct wilco_ec_device *ec, enum led_brightness brightness)
{ {
struct wilco_keyboard_leds_msg request; struct wilco_keyboard_leds_msg request;
struct wilco_keyboard_leds_msg response; struct wilco_keyboard_leds_msg response;
int ret;
memset(&request, 0, sizeof(request)); memset(&request, 0, sizeof(request));
request.command = WILCO_EC_COMMAND_KBBL; request.command = WILCO_EC_COMMAND_KBBL;
...@@ -94,7 +88,18 @@ static int set_kbbl(struct wilco_ec_device *ec, enum led_brightness brightness) ...@@ -94,7 +88,18 @@ static int set_kbbl(struct wilco_ec_device *ec, enum led_brightness brightness)
request.mode = WILCO_KBBL_MODE_FLAG_PWM; request.mode = WILCO_KBBL_MODE_FLAG_PWM;
request.percent = brightness; request.percent = brightness;
return send_kbbl_msg(ec, &request, &response); ret = send_kbbl_msg(ec, &request, &response);
if (ret < 0)
return ret;
if (response.status) {
dev_err(ec->dev,
"EC reported failure sending keyboard LEDs command: %d",
response.status);
return -EIO;
}
return 0;
} }
static int kbbl_exist(struct wilco_ec_device *ec, bool *exists) static int kbbl_exist(struct wilco_ec_device *ec, bool *exists)
...@@ -140,6 +145,13 @@ static int kbbl_init(struct wilco_ec_device *ec) ...@@ -140,6 +145,13 @@ static int kbbl_init(struct wilco_ec_device *ec)
if (ret < 0) if (ret < 0)
return ret; return ret;
if (response.status) {
dev_err(ec->dev,
"EC reported failure sending keyboard LEDs command: %d",
response.status);
return -EIO;
}
if (response.mode & WILCO_KBBL_MODE_FLAG_PWM) if (response.mode & WILCO_KBBL_MODE_FLAG_PWM)
return response.percent; return response.percent;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment