projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 3.12-rc3 into char-misc-next
[deliverable/linux.git]
/
drivers
/
misc
/
mei
/
hbm.c
diff --git
a/drivers/misc/mei/hbm.c
b/drivers/misc/mei/hbm.c
index f1c974a0bc0d3bd5b6a8b7d9f261833b77027e75..9b3a0fb7f265861bc23e42797281e5d2423bc5fc 100644
(file)
--- a/
drivers/misc/mei/hbm.c
+++ b/
drivers/misc/mei/hbm.c
@@
-35,11
+35,15
@@
static void mei_hbm_me_cl_allocate(struct mei_device *dev)
struct mei_me_client *clients;
int b;
struct mei_me_client *clients;
int b;
+ dev->me_clients_num = 0;
+ dev->me_client_presentation_num = 0;
+ dev->me_client_index = 0;
+
/* count how many ME clients we have */
for_each_set_bit(b, dev->me_clients_map, MEI_CLIENTS_MAX)
dev->me_clients_num++;
/* count how many ME clients we have */
for_each_set_bit(b, dev->me_clients_map, MEI_CLIENTS_MAX)
dev->me_clients_num++;
- if (dev->me_clients_num
<
= 0)
+ if (dev->me_clients_num
=
= 0)
return;
kfree(dev->me_clients);
return;
kfree(dev->me_clients);
@@
-221,7
+225,7
@@
static int mei_hbm_prop_req(struct mei_device *dev)
struct hbm_props_request *prop_req;
const size_t len = sizeof(struct hbm_props_request);
unsigned long next_client_index;
struct hbm_props_request *prop_req;
const size_t len = sizeof(struct hbm_props_request);
unsigned long next_client_index;
- u
8
client_num;
+ u
nsigned long
client_num;
client_num = dev->me_client_presentation_num;
client_num = dev->me_client_presentation_num;
@@
-680,8
+684,6
@@
void mei_hbm_dispatch(struct mei_device *dev, struct mei_msg_hdr *hdr)
if (dev->dev_state == MEI_DEV_INIT_CLIENTS &&
dev->hbm_state == MEI_HBM_ENUM_CLIENTS) {
dev->init_clients_timer = 0;
if (dev->dev_state == MEI_DEV_INIT_CLIENTS &&
dev->hbm_state == MEI_HBM_ENUM_CLIENTS) {
dev->init_clients_timer = 0;
- dev->me_client_presentation_num = 0;
- dev->me_client_index = 0;
mei_hbm_me_cl_allocate(dev);
dev->hbm_state = MEI_HBM_CLIENT_PROPERTIES;
mei_hbm_me_cl_allocate(dev);
dev->hbm_state = MEI_HBM_CLIENT_PROPERTIES;
This page took
0.026267 seconds
and
5
git commands to generate.