summaryrefslogtreecommitdiffstats
path: root/drivers/misc/mei/mei_dev.h
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2013-06-23 09:42:49 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-06-25 01:32:31 +0200
commitc20c68d535409f2ff000415d5e0578529c016521 (patch)
tree2403718e9c823d1845e33382a81bccfcb0653269 /drivers/misc/mei/mei_dev.h
parentmei: mei_cl_connect: don't multiply the timeout twice (diff)
downloadlinux-c20c68d535409f2ff000415d5e0578529c016521.tar.xz
linux-c20c68d535409f2ff000415d5e0578529c016521.zip
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 {
bool (*host_is_ready) (struct mei_device *dev);
bool (*hw_is_ready) (struct mei_device *dev);
- void (*hw_reset) (struct mei_device *dev, bool enable);
+ int (*hw_reset) (struct mei_device *dev, bool enable);
int (*hw_start) (struct mei_device *dev);
void (*hw_config) (struct mei_device *dev);
@@ -539,9 +539,9 @@ static inline void mei_hw_config(struct mei_device *dev)
{
dev->ops->hw_config(dev);
}
-static inline void mei_hw_reset(struct mei_device *dev, bool enable)
+static inline int mei_hw_reset(struct mei_device *dev, bool enable)
{
- dev->ops->hw_reset(dev, enable);
+ return dev->ops->hw_reset(dev, enable);
}
static inline void mei_hw_start(struct mei_device *dev)