Re: hp_sdc_rtc: fix broken ioctl conversion

[Frederic Weisbecker <fweisbec@gmail.com>]

On Sat, Jun 05, 2010 at 10:52:21PM +0200, Arnd Bergmann wrote:
> 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.
> 
> On Saturday 05 June 2010, Geert Uytterhoeven wrote:
> > Something went wrong with this one:
> > 
> > | 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
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> 
> 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,
>  };



Queued for .35, thanks!