From: Arjan van de Ven <arjan@infradead.org>
Date: Tue, 10 Jan 2006 06:59:51 +0000 (-0500)
Subject: Input: prepare for f_ops constness
X-Git-Tag: v2.6.16-rc1~169^2~9
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=e2bd470ec7ebccb338758b5ab1bebf1c7b926b04;p=safe%2Fjmp%2Flinux-2.6

Input: prepare for f_ops constness

Avoid doing assignments to a live ->fops so it can be marked as 'const'.

Signed-off-by: Arjan van de Ven <arjan@infradead.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
---

diff --git a/drivers/input/input.c b/drivers/input/input.c
index ef5824c..fe33ff3 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -477,8 +477,8 @@ static int __init input_proc_init(void)
 
 	entry->owner = THIS_MODULE;
 	input_fileops = *entry->proc_fops;
+	input_fileops.poll = input_devices_poll;
 	entry->proc_fops = &input_fileops;
-	entry->proc_fops->poll = input_devices_poll;
 
 	entry = create_proc_read_entry("handlers", 0, proc_bus_input_dir, input_handlers_read, NULL);
 	if (!entry)