diff options
| author |   Benson Leung <bleung@chromium.org> | 2019-09-07 08:06:10 -0700 |
|---|---|---|
| committer | Benson Leung <bleung@chromium.org> | 2019-09-07 08:06:24 -0700 |
| commit | 018711397950b6ceeb26cbbd09023e6e2dd2b27f (patch) | |
| tree | 3f100f5fcffc5dff1b69d8b1141f4a43b91250ec /drivers/platform/chrome | |
| parent | Merge tag 'ib-mfd-extcon-hid-i2c-iio-input-media-chrome-power-pwm-rtc-sound-v5.4' into chrome-platform/for-next (diff) | |
| parent | platform/chrome: cros_ec_ishtp: fix crash during suspend (diff) | |
| download | linux-dev-018711397950b6ceeb26cbbd09023e6e2dd2b27f.tar.xz linux-dev-018711397950b6ceeb26cbbd09023e6e2dd2b27f.zip | |
Merge tag 'tag-chrome-platform-fixes-for-v5.3-rc6' into for-next
chrome-platform fixes for v5.3-rc6
Fixes:
1. platform/chrome: cros_ec_ishtp: fix crash during suspend
- Fixes a kernel crash during suspend/resume of cros_ec_ishtp
Signed-off-by: Benson Leung <bleung@chromium.org>
Diffstat (limited to 'drivers/platform/chrome')
| -rw-r--r-- | drivers/platform/chrome/cros_ec_ishtp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/platform/chrome/cros_ec_ishtp.c b/drivers/platform/chrome/cros_ec_ishtp.c index 7d050db5b1ca..25ca2c894b4d 100644 --- a/drivers/platform/chrome/cros_ec_ishtp.c +++ b/drivers/platform/chrome/cros_ec_ishtp.c @@ -706,7 +706,7 @@ static int cros_ec_ishtp_reset(struct ishtp_cl_device *cl_device) */ static int __maybe_unused cros_ec_ishtp_suspend(struct device *device) { - struct ishtp_cl_device *cl_device = dev_get_drvdata(device); + struct ishtp_cl_device *cl_device = ishtp_dev_to_cl_device(device); struct ishtp_cl *cros_ish_cl = ishtp_get_drvdata(cl_device); struct ishtp_cl_data *client_data = ishtp_get_client_data(cros_ish_cl); @@ -721,7 +721,7 @@ static int __maybe_unused cros_ec_ishtp_suspend(struct device *device) */ static int __maybe_unused cros_ec_ishtp_resume(struct device *device) { - struct ishtp_cl_device *cl_device = dev_get_drvdata(device); + struct ishtp_cl_device *cl_device = ishtp_dev_to_cl_device(device); struct ishtp_cl *cros_ish_cl = ishtp_get_drvdata(cl_device); struct ishtp_cl_data *client_data = ishtp_get_client_data(cros_ish_cl); |