Guest User

0004-mxsfb-mxsfb_resume-Remove-infinite-recursive-loop.patch

a guest
Nov 30th, 2018
115
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. From e7cb384afe2c4d61d67db15b4c6e07971f5e0e4b Mon Sep 17 00:00:00 2001
  2. From: Joe Balough <scallopedllama@gmail.com>
  3. Date: Thu, 18 Oct 2018 13:03:24 -0400
  4. Subject: [PATCH 06/11] mxsfb: mxsfb_resume: Remove infinite recursive loop
  5.  
  6. Previous patch introduced an infinite recursive loop into
  7. mxsfb_resume. Assume this was added accidentally and remove it.
  8. ---
  9. drivers/video/fbdev/mxsfb.c | 4 +---
  10. 1 file changed, 1 insertion(+), 3 deletions(-)
  11.  
  12. diff --git a/drivers/video/fbdev/mxsfb.c b/drivers/video/fbdev/mxsfb.c
  13. index 18782cd61c62..1a1793316c62 100644
  14. --- a/drivers/video/fbdev/mxsfb.c
  15. +++ b/drivers/video/fbdev/mxsfb.c
  16. @@ -2713,9 +2713,7 @@ static int mxsfb_resume(struct device *pdev)
  17. struct mxsfb_info *host = dev_get_drvdata(pdev);
  18. struct fb_info *fb_info = host->fb_info;
  19.  
  20. - // TODO: Watch this, this looks like an infinite recursive loop...
  21. - // - pinctrl_pm_select_default_state(pdev);
  22. - mxsfb_resume(pdev);
  23. + pinctrl_pm_select_default_state(pdev);
  24.  
  25. console_lock();
  26. mxsfb_blank(host->restore_blank, fb_info);
  27. --
  28. 2.19.1
RAW Paste Data