aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/misc/mei/hbm.c8
-rw-r--r--drivers/misc/mei/hw-me.c2
-rw-r--r--drivers/misc/mei/init.c4
-rw-r--r--drivers/misc/mei/mei_dev.h2
4 files changed, 8 insertions, 8 deletions
diff --git a/drivers/misc/mei/hbm.c b/drivers/misc/mei/hbm.c
index 4de80d9b7c45..db605f5cf187 100644
--- a/drivers/misc/mei/hbm.c
+++ b/drivers/misc/mei/hbm.c
@@ -52,7 +52,7 @@ static void mei_hbm_me_cl_allocate(struct mei_device *dev)
52 sizeof(struct mei_me_client), GFP_KERNEL); 52 sizeof(struct mei_me_client), GFP_KERNEL);
53 if (!clients) { 53 if (!clients) {
54 dev_err(&dev->pdev->dev, "memory allocation for ME clients failed.\n"); 54 dev_err(&dev->pdev->dev, "memory allocation for ME clients failed.\n");
55 dev->dev_state = MEI_DEV_RESETING; 55 dev->dev_state = MEI_DEV_RESETTING;
56 mei_reset(dev, 1); 56 mei_reset(dev, 1);
57 return; 57 return;
58 } 58 }
@@ -167,7 +167,7 @@ int mei_hbm_start_req(struct mei_device *dev)
167 dev->hbm_state = MEI_HBM_IDLE; 167 dev->hbm_state = MEI_HBM_IDLE;
168 if (mei_write_message(dev, mei_hdr, dev->wr_msg.data)) { 168 if (mei_write_message(dev, mei_hdr, dev->wr_msg.data)) {
169 dev_err(&dev->pdev->dev, "version message writet failed\n"); 169 dev_err(&dev->pdev->dev, "version message writet failed\n");
170 dev->dev_state = MEI_DEV_RESETING; 170 dev->dev_state = MEI_DEV_RESETTING;
171 mei_reset(dev, 1); 171 mei_reset(dev, 1);
172 return -ENODEV; 172 return -ENODEV;
173 } 173 }
@@ -196,7 +196,7 @@ static void mei_hbm_enum_clients_req(struct mei_device *dev)
196 enum_req->hbm_cmd = HOST_ENUM_REQ_CMD; 196 enum_req->hbm_cmd = HOST_ENUM_REQ_CMD;
197 197
198 if (mei_write_message(dev, mei_hdr, dev->wr_msg.data)) { 198 if (mei_write_message(dev, mei_hdr, dev->wr_msg.data)) {
199 dev->dev_state = MEI_DEV_RESETING; 199 dev->dev_state = MEI_DEV_RESETTING;
200 dev_err(&dev->pdev->dev, "enumeration request write failed.\n"); 200 dev_err(&dev->pdev->dev, "enumeration request write failed.\n");
201 mei_reset(dev, 1); 201 mei_reset(dev, 1);
202 } 202 }
@@ -249,7 +249,7 @@ static int mei_hbm_prop_req(struct mei_device *dev)
249 prop_req->address = next_client_index; 249 prop_req->address = next_client_index;
250 250
251 if (mei_write_message(dev, mei_hdr, dev->wr_msg.data)) { 251 if (mei_write_message(dev, mei_hdr, dev->wr_msg.data)) {
252 dev->dev_state = MEI_DEV_RESETING; 252 dev->dev_state = MEI_DEV_RESETTING;
253 dev_err(&dev->pdev->dev, "properties request write failed\n"); 253 dev_err(&dev->pdev->dev, "properties request write failed\n");
254 mei_reset(dev, 1); 254 mei_reset(dev, 1);
255 255
diff --git a/drivers/misc/mei/hw-me.c b/drivers/misc/mei/hw-me.c
index 3d6dfa35b1d7..fc032270916a 100644
--- a/drivers/misc/mei/hw-me.c
+++ b/drivers/misc/mei/hw-me.c
@@ -481,7 +481,7 @@ irqreturn_t mei_me_irq_thread_handler(int irq, void *dev_id)
481 481
482 /* check if ME wants a reset */ 482 /* check if ME wants a reset */
483 if (!mei_hw_is_ready(dev) && 483 if (!mei_hw_is_ready(dev) &&
484 dev->dev_state != MEI_DEV_RESETING && 484 dev->dev_state != MEI_DEV_RESETTING &&
485 dev->dev_state != MEI_DEV_INITIALIZING) { 485 dev->dev_state != MEI_DEV_INITIALIZING) {
486 dev_dbg(&dev->pdev->dev, "FW not ready.\n"); 486 dev_dbg(&dev->pdev->dev, "FW not ready.\n");
487 mei_reset(dev, 1); 487 mei_reset(dev, 1);
diff --git a/drivers/misc/mei/init.c b/drivers/misc/mei/init.c
index 59159e05446c..713d89fedc46 100644
--- a/drivers/misc/mei/init.c
+++ b/drivers/misc/mei/init.c
@@ -33,7 +33,7 @@ const char *mei_dev_state_str(int state)
33 MEI_DEV_STATE(INITIALIZING); 33 MEI_DEV_STATE(INITIALIZING);
34 MEI_DEV_STATE(INIT_CLIENTS); 34 MEI_DEV_STATE(INIT_CLIENTS);
35 MEI_DEV_STATE(ENABLED); 35 MEI_DEV_STATE(ENABLED);
36 MEI_DEV_STATE(RESETING); 36 MEI_DEV_STATE(RESETTING);
37 MEI_DEV_STATE(DISABLED); 37 MEI_DEV_STATE(DISABLED);
38 MEI_DEV_STATE(POWER_DOWN); 38 MEI_DEV_STATE(POWER_DOWN);
39 MEI_DEV_STATE(POWER_UP); 39 MEI_DEV_STATE(POWER_UP);
@@ -146,7 +146,7 @@ void mei_reset(struct mei_device *dev, int interrupts_enabled)
146 if (dev->dev_state != MEI_DEV_INITIALIZING) { 146 if (dev->dev_state != MEI_DEV_INITIALIZING) {
147 if (dev->dev_state != MEI_DEV_DISABLED && 147 if (dev->dev_state != MEI_DEV_DISABLED &&
148 dev->dev_state != MEI_DEV_POWER_DOWN) 148 dev->dev_state != MEI_DEV_POWER_DOWN)
149 dev->dev_state = MEI_DEV_RESETING; 149 dev->dev_state = MEI_DEV_RESETTING;
150 150
151 mei_cl_all_disconnect(dev); 151 mei_cl_all_disconnect(dev);
152 152
diff --git a/drivers/misc/mei/mei_dev.h b/drivers/misc/mei/mei_dev.h
index c91c492063aa..4de5140e7379 100644
--- a/drivers/misc/mei/mei_dev.h
+++ b/drivers/misc/mei/mei_dev.h
@@ -97,7 +97,7 @@ enum mei_dev_state {
97 MEI_DEV_INITIALIZING = 0, 97 MEI_DEV_INITIALIZING = 0,
98 MEI_DEV_INIT_CLIENTS, 98 MEI_DEV_INIT_CLIENTS,
99 MEI_DEV_ENABLED, 99 MEI_DEV_ENABLED,
100 MEI_DEV_RESETING, 100 MEI_DEV_RESETTING,
101 MEI_DEV_DISABLED, 101 MEI_DEV_DISABLED,
102 MEI_DEV_POWER_DOWN, 102 MEI_DEV_POWER_DOWN,
103 MEI_DEV_POWER_UP 103 MEI_DEV_POWER_UP