aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2010-03-25 10:20:01 -0400
committerJiri Kosina <jkosina@suse.cz>2010-03-25 10:20:01 -0400
commit0a504541b3ba593535d70f3124546e5e471a175e (patch)
tree60dc33b81aa081f697510f40c17cf7263ef549a7
parent2e57480b2a717916510b0c23b2851398a4cbd958 (diff)
HID: remove excessive _EMERG messages from hidraw
We don't need to shout loudly when device gets disconnected while hidraw node has been open, as this is properly handled in disconnect() and protected by minors_lock already. Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--drivers/hid/hidraw.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c
index 589dac5b5f56..7919d3e843b6 100644
--- a/drivers/hid/hidraw.c
+++ b/drivers/hid/hidraw.c
@@ -176,8 +176,6 @@ static int hidraw_open(struct inode *inode, struct file *file)
176 176
177 mutex_lock(&minors_lock); 177 mutex_lock(&minors_lock);
178 if (!hidraw_table[minor]) { 178 if (!hidraw_table[minor]) {
179 printk(KERN_EMERG "hidraw device with minor %d doesn't exist\n",
180 minor);
181 kfree(list); 179 kfree(list);
182 err = -ENODEV; 180 err = -ENODEV;
183 goto out_unlock; 181 goto out_unlock;
@@ -216,11 +214,8 @@ static int hidraw_release(struct inode * inode, struct file * file)
216 struct hidraw *dev; 214 struct hidraw *dev;
217 struct hidraw_list *list = file->private_data; 215 struct hidraw_list *list = file->private_data;
218 216
219 if (!hidraw_table[minor]) { 217 if (!hidraw_table[minor])
220 printk(KERN_EMERG "hidraw device with minor %d doesn't exist\n",
221 minor);
222 return -ENODEV; 218 return -ENODEV;
223 }
224 219
225 list_del(&list->node); 220 list_del(&list->node);
226 dev = hidraw_table[minor]; 221 dev = hidraw_table[minor];