From a9e5cb606aa44a9939e76ade1be864aa62157cfe Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Fri, 7 May 2010 21:47:16 +0200 Subject: [PATCH] --- yaml --- r: 197358 b: refs/heads/master c: db315014ff8148e73d10e927d14c962d2cabd370 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/batman-adv/device.c | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 677dc2d72899..b1368e5a5ac8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 56c341d7af78f6766238725f79a1773aca942795 +refs/heads/master: db315014ff8148e73d10e927d14c962d2cabd370 diff --git a/trunk/drivers/staging/batman-adv/device.c b/trunk/drivers/staging/batman-adv/device.c index c82a5afe8fa8..fbfe234104d2 100644 --- a/trunk/drivers/staging/batman-adv/device.c +++ b/trunk/drivers/staging/batman-adv/device.c @@ -44,10 +44,7 @@ static struct device_client *device_client_hash[256]; void bat_device_init(void) { - int i; - - for (i = 0; i < 256; i++) - device_client_hash[i] = NULL; + memset(device_client_hash, 0, sizeof(device_client_hash)); } int bat_device_setup(void) @@ -103,15 +100,15 @@ int bat_device_open(struct inode *inode, struct file *file) if (!device_client) return -ENOMEM; - for (i = 0; i < 256; i++) { + for (i = 0; i < ARRAY_SIZE(device_client_hash); i++) { if (!device_client_hash[i]) { device_client_hash[i] = device_client; break; } } - if (device_client_hash[i] != device_client) { - printk(KERN_ERR "batman-adv:Error - can't add another packet client: maximum number of clients reached \n"); + if (i == ARRAY_SIZE(device_client_hash)) { + printk(KERN_ERR "batman-adv:Error - can't add another packet client: maximum number of clients reached\n"); kfree(device_client); return -EXFULL; }