Commit 6f37aca8 authored by Tomas Winkler's avatar Tomas Winkler Committed by Greg Kroah-Hartman

staging/mei: fix check for allocating host client id

MEI_CLIENTS_MAX is 255 and host_client_id is u8 therefore
for check to work we need to first assign the return value
of find_first_zero_bit to unsigned long variable

Fix warning

drivers/staging/mei/main.c: In function mei_open
drivers/staging/mei/main.c:260:2: warning: comparison is always false due to limited range of data type
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 5b881e3c
...@@ -228,8 +228,9 @@ static struct mei_cl_cb *find_read_list_entry( ...@@ -228,8 +228,9 @@ static struct mei_cl_cb *find_read_list_entry(
static int mei_open(struct inode *inode, struct file *file) static int mei_open(struct inode *inode, struct file *file)
{ {
struct mei_cl *cl; struct mei_cl *cl;
int err;
struct mei_device *dev; struct mei_device *dev;
unsigned long cl_id;
int err;
err = -ENODEV; err = -ENODEV;
if (!mei_device) if (!mei_device)
...@@ -255,14 +256,16 @@ static int mei_open(struct inode *inode, struct file *file) ...@@ -255,14 +256,16 @@ static int mei_open(struct inode *inode, struct file *file)
if (dev->open_handle_count >= MEI_MAX_OPEN_HANDLE_COUNT) if (dev->open_handle_count >= MEI_MAX_OPEN_HANDLE_COUNT)
goto out_unlock; goto out_unlock;
cl->host_client_id = find_first_zero_bit(dev->host_clients_map, cl_id = find_first_zero_bit(dev->host_clients_map, MEI_CLIENTS_MAX);
MEI_CLIENTS_MAX); if (cl_id >= MEI_CLIENTS_MAX)
if (cl->host_client_id > MEI_CLIENTS_MAX)
goto out_unlock; goto out_unlock;
cl->host_client_id = cl_id;
dev_dbg(&dev->pdev->dev, "client_id = %d\n", cl->host_client_id); dev_dbg(&dev->pdev->dev, "client_id = %d\n", cl->host_client_id);
dev->open_handle_count++; dev->open_handle_count++;
list_add_tail(&cl->link, &dev->file_list); list_add_tail(&cl->link, &dev->file_list);
set_bit(cl->host_client_id, dev->host_clients_map); set_bit(cl->host_client_id, dev->host_clients_map);
......
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