diff options
author | Tomas Winkler <tomas.winkler@intel.com> | 2013-06-23 03:42:49 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-24 19:32:31 -0400 |
commit | c20c68d535409f2ff000415d5e0578529c016521 (patch) | |
tree | 2403718e9c823d1845e33382a81bccfcb0653269 /drivers/misc/mei/hw-me.c | |
parent | 206ecfc21121aa272f3f9fa23e1ed252a12e8a5c (diff) |
mei: check if the hardware reset succeeded
The hw may have multiple steps for resetting
so we need to check if it has really succeeded.
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/mei/hw-me.c')
-rw-r--r-- | drivers/misc/mei/hw-me.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/misc/mei/hw-me.c b/drivers/misc/mei/hw-me.c index 822170f00348..e4f8dec4dc3c 100644 --- a/drivers/misc/mei/hw-me.c +++ b/drivers/misc/mei/hw-me.c | |||
@@ -171,7 +171,7 @@ static void mei_me_hw_reset_release(struct mei_device *dev) | |||
171 | * @dev: the device structure | 171 | * @dev: the device structure |
172 | * @intr_enable: if interrupt should be enabled after reset. | 172 | * @intr_enable: if interrupt should be enabled after reset. |
173 | */ | 173 | */ |
174 | static void mei_me_hw_reset(struct mei_device *dev, bool intr_enable) | 174 | static int mei_me_hw_reset(struct mei_device *dev, bool intr_enable) |
175 | { | 175 | { |
176 | struct mei_me_hw *hw = to_me_hw(dev); | 176 | struct mei_me_hw *hw = to_me_hw(dev); |
177 | u32 hcsr = mei_hcsr_read(hw); | 177 | u32 hcsr = mei_hcsr_read(hw); |
@@ -191,6 +191,7 @@ static void mei_me_hw_reset(struct mei_device *dev, bool intr_enable) | |||
191 | mei_me_hw_reset_release(dev); | 191 | mei_me_hw_reset_release(dev); |
192 | 192 | ||
193 | dev_dbg(&dev->pdev->dev, "current HCSR = 0x%08x.\n", mei_hcsr_read(hw)); | 193 | dev_dbg(&dev->pdev->dev, "current HCSR = 0x%08x.\n", mei_hcsr_read(hw)); |
194 | return 0; | ||
194 | } | 195 | } |
195 | 196 | ||
196 | /** | 197 | /** |