[GIT PULL] ioctl bkl pushdown fix

From: Frederic Weisbecker
Date: Tue Jun 08 2010 - 19:34:07 EST


Please pull the bkl/fixes branch that can be found at:



Arnd Bergmann (1):
hp_sdc_rtc: fix broken ioctl conversion

drivers/input/misc/hp_sdc_rtc.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

commit af0d5cb908f7f9adeb5d3d3dbef64c644bb6809c
Author: Arnd Bergmann <arnd@xxxxxxxx>
Date: Sat Jun 5 22:52:21 2010 +0200

hp_sdc_rtc: fix broken ioctl conversion

Commit 55929332c92 "drivers: Push down BKL into various drivers"
introduced a regression in hp_sdc_rtc, caused by a missing
change of the .unlocked_ioctl pointer to the newly introduced


drivers/input/misc/hp_sdc_rtc.c:681: warning: initialization from
incompatible pointer type
drivers/input/misc/hp_sdc_rtc.c:665: warning:
â??hp_sdc_rtc_unlocked_ioctlâ?? defined but not used

Reported-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
Acked-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
Signed-off-by: Frederic Weisbecker <fweisbec@xxxxxxxxx>

diff --git a/drivers/input/misc/hp_sdc_rtc.c b/drivers/input/misc/hp_sdc_rtc.c
index e00a1cc..c190664 100644
--- a/drivers/input/misc/hp_sdc_rtc.c
+++ b/drivers/input/misc/hp_sdc_rtc.c
@@ -678,7 +678,7 @@ static const struct file_operations hp_sdc_rtc_fops = {
.llseek = no_llseek,
.read = hp_sdc_rtc_read,
.poll = hp_sdc_rtc_poll,
- .unlocked_ioctl = hp_sdc_rtc_ioctl,
+ .unlocked_ioctl = hp_sdc_rtc_unlocked_ioctl,
.open = hp_sdc_rtc_open,
.fasync = hp_sdc_rtc_fasync,
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/