Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5b7c167 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'tag-chrome-platform-fixes-for-v5.3-rc6' of... 

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

Pull chrome platform fix from Benson Leung:
 "Fix a kernel crash during suspend/resume of cros_ec_ishtp"

* tag 'tag-chrome-platform-fixes-for-v5.3-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux:
  platform/chrome: cros_ec_ishtp: fix crash during suspend
parents e8c3fa9f 9cdde858

drivers/platform/chrome/cros_ec_ishtp.c

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