Commit 0cfee51c authored by Bill Nottingham's avatar Bill Nottingham Committed by Greg Kroah-Hartman

mei: reseting -> resetting

This enum leaks out to userspace via error messages, so fix the spelling.
Signed-off-by: default avatarBill Nottingham <notting@redhat.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fcb136e1
...@@ -52,7 +52,7 @@ static void mei_hbm_me_cl_allocate(struct mei_device *dev) ...@@ -52,7 +52,7 @@ static void mei_hbm_me_cl_allocate(struct mei_device *dev)
sizeof(struct mei_me_client), GFP_KERNEL); sizeof(struct mei_me_client), GFP_KERNEL);
if (!clients) { if (!clients) {
dev_err(&dev->pdev->dev, "memory allocation for ME clients failed.\n"); dev_err(&dev->pdev->dev, "memory allocation for ME clients failed.\n");
dev->dev_state = MEI_DEV_RESETING; dev->dev_state = MEI_DEV_RESETTING;
mei_reset(dev, 1); mei_reset(dev, 1);
return; return;
} }
...@@ -167,7 +167,7 @@ int mei_hbm_start_req(struct mei_device *dev) ...@@ -167,7 +167,7 @@ int mei_hbm_start_req(struct mei_device *dev)
dev->hbm_state = MEI_HBM_IDLE; dev->hbm_state = MEI_HBM_IDLE;
if (mei_write_message(dev, mei_hdr, dev->wr_msg.data)) { if (mei_write_message(dev, mei_hdr, dev->wr_msg.data)) {
dev_err(&dev->pdev->dev, "version message writet failed\n"); dev_err(&dev->pdev->dev, "version message writet failed\n");
dev->dev_state = MEI_DEV_RESETING; dev->dev_state = MEI_DEV_RESETTING;
mei_reset(dev, 1); mei_reset(dev, 1);
return -ENODEV; return -ENODEV;
} }
...@@ -196,7 +196,7 @@ static void mei_hbm_enum_clients_req(struct mei_device *dev) ...@@ -196,7 +196,7 @@ static void mei_hbm_enum_clients_req(struct mei_device *dev)
enum_req->hbm_cmd = HOST_ENUM_REQ_CMD; enum_req->hbm_cmd = HOST_ENUM_REQ_CMD;
if (mei_write_message(dev, mei_hdr, dev->wr_msg.data)) { if (mei_write_message(dev, mei_hdr, dev->wr_msg.data)) {
dev->dev_state = MEI_DEV_RESETING; dev->dev_state = MEI_DEV_RESETTING;
dev_err(&dev->pdev->dev, "enumeration request write failed.\n"); dev_err(&dev->pdev->dev, "enumeration request write failed.\n");
mei_reset(dev, 1); mei_reset(dev, 1);
} }
...@@ -249,7 +249,7 @@ static int mei_hbm_prop_req(struct mei_device *dev) ...@@ -249,7 +249,7 @@ static int mei_hbm_prop_req(struct mei_device *dev)
prop_req->address = next_client_index; prop_req->address = next_client_index;
if (mei_write_message(dev, mei_hdr, dev->wr_msg.data)) { if (mei_write_message(dev, mei_hdr, dev->wr_msg.data)) {
dev->dev_state = MEI_DEV_RESETING; dev->dev_state = MEI_DEV_RESETTING;
dev_err(&dev->pdev->dev, "properties request write failed\n"); dev_err(&dev->pdev->dev, "properties request write failed\n");
mei_reset(dev, 1); mei_reset(dev, 1);
......
...@@ -481,7 +481,7 @@ irqreturn_t mei_me_irq_thread_handler(int irq, void *dev_id) ...@@ -481,7 +481,7 @@ irqreturn_t mei_me_irq_thread_handler(int irq, void *dev_id)
/* check if ME wants a reset */ /* check if ME wants a reset */
if (!mei_hw_is_ready(dev) && if (!mei_hw_is_ready(dev) &&
dev->dev_state != MEI_DEV_RESETING && dev->dev_state != MEI_DEV_RESETTING &&
dev->dev_state != MEI_DEV_INITIALIZING) { dev->dev_state != MEI_DEV_INITIALIZING) {
dev_dbg(&dev->pdev->dev, "FW not ready.\n"); dev_dbg(&dev->pdev->dev, "FW not ready.\n");
mei_reset(dev, 1); mei_reset(dev, 1);
......
...@@ -33,7 +33,7 @@ const char *mei_dev_state_str(int state) ...@@ -33,7 +33,7 @@ const char *mei_dev_state_str(int state)
MEI_DEV_STATE(INITIALIZING); MEI_DEV_STATE(INITIALIZING);
MEI_DEV_STATE(INIT_CLIENTS); MEI_DEV_STATE(INIT_CLIENTS);
MEI_DEV_STATE(ENABLED); MEI_DEV_STATE(ENABLED);
MEI_DEV_STATE(RESETING); MEI_DEV_STATE(RESETTING);
MEI_DEV_STATE(DISABLED); MEI_DEV_STATE(DISABLED);
MEI_DEV_STATE(POWER_DOWN); MEI_DEV_STATE(POWER_DOWN);
MEI_DEV_STATE(POWER_UP); MEI_DEV_STATE(POWER_UP);
...@@ -146,7 +146,7 @@ void mei_reset(struct mei_device *dev, int interrupts_enabled) ...@@ -146,7 +146,7 @@ void mei_reset(struct mei_device *dev, int interrupts_enabled)
if (dev->dev_state != MEI_DEV_INITIALIZING) { if (dev->dev_state != MEI_DEV_INITIALIZING) {
if (dev->dev_state != MEI_DEV_DISABLED && if (dev->dev_state != MEI_DEV_DISABLED &&
dev->dev_state != MEI_DEV_POWER_DOWN) dev->dev_state != MEI_DEV_POWER_DOWN)
dev->dev_state = MEI_DEV_RESETING; dev->dev_state = MEI_DEV_RESETTING;
mei_cl_all_disconnect(dev); mei_cl_all_disconnect(dev);
......
...@@ -97,7 +97,7 @@ enum mei_dev_state { ...@@ -97,7 +97,7 @@ enum mei_dev_state {
MEI_DEV_INITIALIZING = 0, MEI_DEV_INITIALIZING = 0,
MEI_DEV_INIT_CLIENTS, MEI_DEV_INIT_CLIENTS,
MEI_DEV_ENABLED, MEI_DEV_ENABLED,
MEI_DEV_RESETING, MEI_DEV_RESETTING,
MEI_DEV_DISABLED, MEI_DEV_DISABLED,
MEI_DEV_POWER_DOWN, MEI_DEV_POWER_DOWN,
MEI_DEV_POWER_UP MEI_DEV_POWER_UP
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment