]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
iwlwifi: make sure d3_suspend/resume ops exist
authorEliad Peller <eliadx.peller@intel.com>
Thu, 30 Jul 2015 13:53:27 +0000 (16:53 +0300)
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Sun, 16 Aug 2015 07:14:31 +0000 (10:14 +0300)
We added calls to d3_suspend/resume trans ops during the
suspend/resume flow.

However, the wrapper code didn't verify the trans ops were
actually defined, resulting in panic when they were not
(such as in the case of sdio trans)

Fixes: 6dfb36c89dc2 ("iwlwifi: call d3_suspend/resume in d0i3 case as well")
Signed-off-by: Eliad Peller <eliadx.peller@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
drivers/net/wireless/iwlwifi/iwl-trans.h

index 9d8b5cb06343356746ae76041b5eae9b2a3d9399..c829c505e1419cf3ce84356f9a07c4b85b8ae447 100644 (file)
@@ -810,7 +810,8 @@ static inline void iwl_trans_stop_device(struct iwl_trans *trans)
 static inline void iwl_trans_d3_suspend(struct iwl_trans *trans, bool test)
 {
        might_sleep();
-       trans->ops->d3_suspend(trans, test);
+       if (trans->ops->d3_suspend)
+               trans->ops->d3_suspend(trans, test);
 }
 
 static inline int iwl_trans_d3_resume(struct iwl_trans *trans,
@@ -818,6 +819,9 @@ static inline int iwl_trans_d3_resume(struct iwl_trans *trans,
                                      bool test)
 {
        might_sleep();
+       if (!trans->ops->d3_resume)
+               return 0;
+
        return trans->ops->d3_resume(trans, status, test);
 }