rfkill: always call get_state() hook on resume

We "optimize" away the get_state() hook call on rfkill_toggle_radio
when doing a forced state change.  This means the resume path is not
calling get_state() as it should.

Call it manually on the resume handler, as we don't want to mess with
the EPO path by removing the optimization.  This has the added benefit
of making it explicit that rfkill->state could have been modified
before we hit the rfkill_toggle_radio() call in the class resume
handler.

Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Acked-by: Ivo van Doorn <IvDoorn@gmail.com>
Cc: Matthew Garrett <mjg59@srcf.ucam.org>
Cc: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/net/rfkill/rfkill.c b/net/rfkill/rfkill.c
index 5ad411d3e8f80305327e4661dfade7fbc96ef0b0..051d2c9ea66b77d786ed0ad11ff5bd61bd0911f6 100644 (file)
--- a/net/rfkill/rfkill.c
+++ b/net/rfkill/rfkill.c
@@ -580,12 +580,22 @@ static int rfkill_suspend(struct device *dev, pm_message_t state)
 static int rfkill_resume(struct device *dev)
 {
        struct rfkill *rfkill = to_rfkill(dev);
+       enum rfkill_state newstate;
 
        if (dev->power.power_state.event != PM_EVENT_ON) {
                mutex_lock(&rfkill->mutex);
 
                dev->power.power_state.event = PM_EVENT_ON;
 
+               /*
+                * rfkill->state could have been modified before we got
+                * called, and won't be updated by rfkill_toggle_radio()
+                * in force mode.  Sync it FIRST.
+                */
+               if (rfkill->get_state &&
+                   !rfkill->get_state(rfkill->data, &newstate))
+                       rfkill->state = newstate;
+
                /*
                 * If we are under EPO, kick transmitter offline,
                 * otherwise restore to pre-suspend state.