mirror of
https://github.com/torvalds/linux.git
synced 2024-11-29 23:51:37 +00:00
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 -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQQCtZK6p/AktxXfkOlzbaomhzOwwgUCXV7G+QAKCRBzbaomhzOw wsX6AQCrsQJST4h9Zd3BjD9wPlFoQbgC1D8SUv1wMMzoaA/PHAD/bU7IfeE5s2R6 +UOqOrnI94hK5lQfBcRRK5RlnnpZyQc= =uWdA -----END PGP SIGNATURE----- gpgsig -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQQCtZK6p/AktxXfkOlzbaomhzOwwgUCXXPHcgAKCRBzbaomhzOw woKJAQClkKvT69BObCCMXyYnYeoPY29N0udfjEncIW8w6Gh7rQD/VlGeXqSB8uEa U5LCOHgFQzafpxDo0dBiXz1vVpKGrgc= =0O7B -----END PGP SIGNATURE----- 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>
This commit is contained in:
commit
0187113979
@ -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);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user