diff options
| author | Alexander Usyskin <alexander.usyskin@intel.com> | 2016-02-07 23:35:43 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-07 14:47:20 -0800 |
| commit | 025fb792bac33632c19fe12265ba1f6108921300 (patch) | |
| tree | 0e0a83498bf3a76e71e1bfabba03b3a541d314d0 /drivers/misc/mei/amthif.c | |
| parent | 27f476ea98ed495839662db4e3a76357bbeb1bb3 (diff) | |
| download | linux-025fb792bac33632c19fe12265ba1f6108921300.tar.gz linux-025fb792bac33632c19fe12265ba1f6108921300.tar.bz2 linux-025fb792bac33632c19fe12265ba1f6108921300.zip | |
mei: split amthif client init from end of clients enumeration
The amthif FW client can appear after the end of client enumeration.
Amthif host client initialization is done now at FW client discovery
time.
Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.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/amthif.c')
| -rw-r--r-- | drivers/misc/mei/amthif.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/misc/mei/amthif.c b/drivers/misc/mei/amthif.c index de194ef573ee..04525ada9eda 100644 --- a/drivers/misc/mei/amthif.c +++ b/drivers/misc/mei/amthif.c @@ -67,6 +67,9 @@ int mei_amthif_host_init(struct mei_device *dev, struct mei_me_client *me_cl) struct mei_cl *cl = &dev->iamthif_cl; int ret; + if (mei_cl_is_connected(cl)) + return 0; + dev->iamthif_state = MEI_IAMTHIF_IDLE; mei_cl_init(cl, dev); @@ -79,8 +82,6 @@ int mei_amthif_host_init(struct mei_device *dev, struct mei_me_client *me_cl) ret = mei_cl_connect(cl, me_cl, NULL); - dev->iamthif_state = MEI_IAMTHIF_IDLE; - return ret; } |