diff options
| author | Bill Nottingham <notting@redhat.com> | 2013-04-19 22:01:36 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-19 13:38:39 -0700 |
| commit | 0cfee51c7c1fa47d81b3d116df3b53c586aac422 (patch) | |
| tree | bddd56b385abfd3fc295a1aa678c75647d8cd41c /drivers/misc/mei | |
| parent | fcb136e1ac5774909e0d85189f721b8dfa800e0f (diff) | |
| download | blackbird-op-linux-0cfee51c7c1fa47d81b3d116df3b53c586aac422.tar.gz blackbird-op-linux-0cfee51c7c1fa47d81b3d116df3b53c586aac422.zip | |
mei: reseting -> resetting
This enum leaks out to userspace via error messages, so fix the spelling.
Signed-off-by: Bill Nottingham <notting@redhat.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/mei')
| -rw-r--r-- | drivers/misc/mei/hbm.c | 8 | ||||
| -rw-r--r-- | drivers/misc/mei/hw-me.c | 2 | ||||
| -rw-r--r-- | drivers/misc/mei/init.c | 4 | ||||
| -rw-r--r-- | drivers/misc/mei/mei_dev.h | 2 |
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) sizeof(struct mei_me_client), GFP_KERNEL); if (!clients) { 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); return; } @@ -167,7 +167,7 @@ int mei_hbm_start_req(struct mei_device *dev) dev->hbm_state = MEI_HBM_IDLE; if (mei_write_message(dev, mei_hdr, dev->wr_msg.data)) { 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); return -ENODEV; } @@ -196,7 +196,7 @@ static void mei_hbm_enum_clients_req(struct mei_device *dev) enum_req->hbm_cmd = HOST_ENUM_REQ_CMD; 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"); mei_reset(dev, 1); } @@ -249,7 +249,7 @@ static int mei_hbm_prop_req(struct mei_device *dev) prop_req->address = next_client_index; 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"); mei_reset(dev, 1); 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) /* check if ME wants a reset */ 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_dbg(&dev->pdev->dev, "FW not ready.\n"); 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) MEI_DEV_STATE(INITIALIZING); MEI_DEV_STATE(INIT_CLIENTS); MEI_DEV_STATE(ENABLED); - MEI_DEV_STATE(RESETING); + MEI_DEV_STATE(RESETTING); MEI_DEV_STATE(DISABLED); MEI_DEV_STATE(POWER_DOWN); MEI_DEV_STATE(POWER_UP); @@ -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_DISABLED && dev->dev_state != MEI_DEV_POWER_DOWN) - dev->dev_state = MEI_DEV_RESETING; + dev->dev_state = MEI_DEV_RESETTING; mei_cl_all_disconnect(dev); 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 { MEI_DEV_INITIALIZING = 0, MEI_DEV_INIT_CLIENTS, MEI_DEV_ENABLED, - MEI_DEV_RESETING, + MEI_DEV_RESETTING, MEI_DEV_DISABLED, MEI_DEV_POWER_DOWN, MEI_DEV_POWER_UP |
