summaryrefslogtreecommitdiffstats
path: root/drivers/misc/mei/init.c
diff options
context:
space:
mode:
authorTomas Winkler2013-06-23 21:49:04 +0200
committerGreg Kroah-Hartman2013-06-25 01:33:28 +0200
commit9049f7932109f3fe189ffa8028f2e23f06a9bd0b (patch)
tree1f5dc15a64dc0d478148abe85909ae9476db20f8 /drivers/misc/mei/init.c
parentmei: check if the hardware reset succeeded (diff)
downloadkernel-qcow2-linux-9049f7932109f3fe189ffa8028f2e23f06a9bd0b.tar.gz
kernel-qcow2-linux-9049f7932109f3fe189ffa8028f2e23f06a9bd0b.tar.xz
kernel-qcow2-linux-9049f7932109f3fe189ffa8028f2e23f06a9bd0b.zip
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>
Diffstat (limited to 'drivers/misc/mei/init.c')
-rw-r--r--drivers/misc/mei/init.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/misc/mei/init.c b/drivers/misc/mei/init.c
index 15253886f37e..6fc573cef178 100644
--- a/drivers/misc/mei/init.c
+++ b/drivers/misc/mei/init.c
@@ -181,7 +181,12 @@ void mei_reset(struct mei_device *dev, int interrupts_enabled)
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");
/* link is established * start sending messages. */