Skip to content

Commit 0187113

Browse files
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 <[email protected]>
2 parents 7e0bb52 + 9cdde85 commit 0187113

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/platform/chrome/cros_ec_ishtp.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -706,7 +706,7 @@ static int cros_ec_ishtp_reset(struct ishtp_cl_device *cl_device)
706706
*/
707707
static int __maybe_unused cros_ec_ishtp_suspend(struct device *device)
708708
{
709-
struct ishtp_cl_device *cl_device = dev_get_drvdata(device);
709+
struct ishtp_cl_device *cl_device = ishtp_dev_to_cl_device(device);
710710
struct ishtp_cl *cros_ish_cl = ishtp_get_drvdata(cl_device);
711711
struct ishtp_cl_data *client_data = ishtp_get_client_data(cros_ish_cl);
712712

@@ -721,7 +721,7 @@ static int __maybe_unused cros_ec_ishtp_suspend(struct device *device)
721721
*/
722722
static int __maybe_unused cros_ec_ishtp_resume(struct device *device)
723723
{
724-
struct ishtp_cl_device *cl_device = dev_get_drvdata(device);
724+
struct ishtp_cl_device *cl_device = ishtp_dev_to_cl_device(device);
725725
struct ishtp_cl *cros_ish_cl = ishtp_get_drvdata(cl_device);
726726
struct ishtp_cl_data *client_data = ishtp_get_client_data(cros_ish_cl);
727727

0 commit comments

Comments
 (0)