Unverified Commit 01871139 authored by Benson Leung's avatar Benson Leung
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: default avatarBenson Leung <bleung@chromium.org>
parents 7e0bb52d 9cdde858

drivers/platform/chrome/cros_ec_ishtp.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -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)

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	*cros_ish_cl = ishtp_get_drvdata(cl_device);

	struct ishtp_cl_data *client_data = ishtp_get_client_data(cros_ish_cl);

	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)

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	*cros_ish_cl = ishtp_get_drvdata(cl_device);

	struct ishtp_cl_data *client_data = ishtp_get_client_data(cros_ish_cl);

	struct ishtp_cl_data *client_data = ishtp_get_client_data(cros_ish_cl);

CRA Git | Maintained and supported by SUSTech CRA and CCSE