Skip to contentSkip to conversation

ioctl bkl pushdown fix

GIT PULL Frederic Weisbecker 1 participant 1 message Jun 8, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Linus,

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

git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git
bkl/fixes

Thanks,
Frederic
---

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 <[email protected]>
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 function.

Fixes:

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

drivers/input/misc/hp_sdc_rtc.c +1 -1
index e00a1cc..c190664 100644
@@ -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,
 };