aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc/mei/mei_dev.h
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2013-06-23 03:42:49 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-06-24 19:32:31 -0400
commitc20c68d535409f2ff000415d5e0578529c016521 (patch)
tree2403718e9c823d1845e33382a81bccfcb0653269 /drivers/misc/mei/mei_dev.h
parent206ecfc21121aa272f3f9fa23e1ed252a12e8a5c (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/mei_dev.h')
-rw-r--r--drivers/misc/mei/mei_dev.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/misc/mei/mei_dev.h b/drivers/misc/mei/mei_dev.h
index 80a90319fc29..1aa499782abe 100644
--- a/drivers/misc/mei/mei_dev.h
+++ b/drivers/misc/mei/mei_dev.h
@@ -233,7 +233,7 @@ struct mei_hw_ops {
233 bool (*host_is_ready) (struct mei_device *dev); 233 bool (*host_is_ready) (struct mei_device *dev);
234 234
235 bool (*hw_is_ready) (struct mei_device *dev); 235 bool (*hw_is_ready) (struct mei_device *dev);
236 void (*hw_reset) (struct mei_device *dev, bool enable); 236 int (*hw_reset) (struct mei_device *dev, bool enable);
237 int (*hw_start) (struct mei_device *dev); 237 int (*hw_start) (struct mei_device *dev);
238 void (*hw_config) (struct mei_device *dev); 238 void (*hw_config) (struct mei_device *dev);
239 239
@@ -539,9 +539,9 @@ static inline void mei_hw_config(struct mei_device *dev)
539{ 539{
540 dev->ops->hw_config(dev); 540 dev->ops->hw_config(dev);
541} 541}
542static inline void mei_hw_reset(struct mei_device *dev, bool enable) 542static inline int mei_hw_reset(struct mei_device *dev, bool enable)
543{ 543{
544 dev->ops->hw_reset(dev, enable); 544 return dev->ops->hw_reset(dev, enable);
545} 545}
546 546
547static inline void mei_hw_start(struct mei_device *dev) 547static inline void mei_hw_start(struct mei_device *dev)