Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d7458da authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'bkl/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing 

* 'bkl/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing:
  hp_sdc_rtc: fix broken ioctl conversion
parents 3975d167 af0d5cb9

drivers/input/misc/hp_sdc_rtc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -678,7 +678,7 @@ static const struct file_operations hp_sdc_rtc_fops = { 
        .llseek =		no_llseek,

        .llseek =		no_llseek,

        .read =			hp_sdc_rtc_read,

        .read =			hp_sdc_rtc_read,

        .poll =			hp_sdc_rtc_poll,

        .poll =			hp_sdc_rtc_poll,

        .unlocked_ioctl = 	hp_sdc_rtc_ioctl,

        .unlocked_ioctl =	hp_sdc_rtc_unlocked_ioctl,

        .open =			hp_sdc_rtc_open,

        .open =			hp_sdc_rtc_open,

        .fasync =		hp_sdc_rtc_fasync,

        .fasync =		hp_sdc_rtc_fasync,

};

};