openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

mei: check whether hw start has succeeded 

hw start may fail therefore the reset flow has
to check for the return value

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Tomas Winkler 2013-06-23 22:49:04 +03:00 committed by Greg Kroah-Hartman
parent c20c68d535
commit 9049f79321
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/misc/mei/init.c
View File

@ -181,7 +181,12 @@ void mei_reset(struct mei_device *dev, int interrupts_enabled)
return; return;
} }
mei_hw_start(dev); ret = mei_hw_start(dev);
if (ret) {
dev_err(&dev->pdev->dev, "hw_start failed disabling the device\n");
dev->dev_state = MEI_DEV_DISABLED;
return;
}
dev_dbg(&dev->pdev->dev, "link is established start sending messages.\n"); dev_dbg(&dev->pdev->dev, "link is established start sending messages.\n");
/* link is established * start sending messages. */ /* link is established * start sending messages. */

4
drivers/misc/mei/mei_dev.h
View File

@ -544,9 +544,9 @@ static inline int mei_hw_reset(struct mei_device *dev, bool enable)
return dev->ops->hw_reset(dev, enable); return dev->ops->hw_reset(dev, enable);
} }
static inline void mei_hw_start(struct mei_device *dev) static inline int mei_hw_start(struct mei_device *dev)
{ {
dev->ops->hw_start(dev); return dev->ops->hw_start(dev);
} }
static inline void mei_clear_interrupts(struct mei_device *dev) static inline void mei_clear_interrupts(struct mei_device *dev)