diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2010-06-05 22:52:21 +0200 |
|---|---|---|
| committer |   Frederic Weisbecker <fweisbec@gmail.com> | 2010-06-08 22:23:21 +0200 |
| commit | af0d5cb908f7f9adeb5d3d3dbef64c644bb6809c (patch) | |
| tree | f6a323f2ac27b7826c14d3eec95f45bef945f4e2 /drivers/input/misc/hp_sdc_rtc.c | |
| parent | Linux 2.6.35-rc2 (diff) | |
| download | linux-dev-af0d5cb908f7f9adeb5d3d3dbef64c644bb6809c.tar.xz linux-dev-af0d5cb908f7f9adeb5d3d3dbef64c644bb6809c.zip | |
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
Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Diffstat (limited to 'drivers/input/misc/hp_sdc_rtc.c')
| -rw-r--r-- | drivers/input/misc/hp_sdc_rtc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/misc/hp_sdc_rtc.c b/drivers/input/misc/hp_sdc_rtc.c index e00a1cc79c0a..c19066479057 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, }; |