tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
+2
-2
+2
-2
drivers/platform/chrome/cros_ec_ishtp.c
+2
-2
drivers/platform/chrome/cros_ec_ishtp.c
···
706
706
*/
707
707
static int __maybe_unused cros_ec_ishtp_suspend(struct device *device)
708
708
{
709
-
struct ishtp_cl_device *cl_device = dev_get_drvdata(device);
709
+
struct ishtp_cl_device *cl_device = ishtp_dev_to_cl_device(device);
710
710
struct ishtp_cl *cros_ish_cl = ishtp_get_drvdata(cl_device);
711
711
struct ishtp_cl_data *client_data = ishtp_get_client_data(cros_ish_cl);
712
712
···
721
721
*/
722
722
static int __maybe_unused cros_ec_ishtp_resume(struct device *device)
723
723
{
724
-
struct ishtp_cl_device *cl_device = dev_get_drvdata(device);
724
+
struct ishtp_cl_device *cl_device = ishtp_dev_to_cl_device(device);
725
725
struct ishtp_cl *cros_ish_cl = ishtp_get_drvdata(cl_device);
726
726
struct ishtp_cl_data *client_data = ishtp_get_client_data(cros_ish_cl);
727
727