On Mon, Feb 08, 2010 at 04:21:53PM -0800, Andrew Morton wrote:
> On Mon, 8 Feb 2010 22:08:10 -0200
> Thadeu Lima de Souza Cascardo <cascardo@xxxxxxxxxxxxxx> wrote:
>
> >
> > ...
> >
> > > --- a/drivers/platform/x86/thinkpad_acpi.c~thinkpad-acpi-setup-hotkey-polling-after-changing-hotkey_driver_mask-fix
> > > +++ a/drivers/platform/x86/thinkpad_acpi.c
> > > @@ -2597,6 +2597,10 @@ static void hotkey_poll_set_freq(unsigne
> > >
> > > #else /* CONFIG_THINKPAD_ACPI_HOTKEY_POLL */
> > >
> > > +static void hotkey_poll_setup(bool __unused)
> > > +{
> > > +}
> > > +
> > > static void hotkey_poll_setup_safe(bool __unused)
> > > {
> > > }
> > > @@ -2694,9 +2698,7 @@ static ssize_t hotkey_mask_store(struct
> > >
> > > res = hotkey_user_mask_set(t);
> > >
> > > -#ifdef CONFIG_THINKPAD_ACPI_HOTKEY_POLL
> > > hotkey_poll_setup(true);
> > > -#endif
> > >
> > > mutex_unlock(&hotkey_mutex);
> > >
> > > @@ -6273,9 +6275,7 @@ static int __init brightness_init(struct
> > > | TP_ACPI_HKEY_BRGHTUP_MASK
> > > | TP_ACPI_HKEY_BRGHTDWN_MASK);;
> > >
> > > -#ifdef CONFIG_THINKPAD_ACPI_HOTKEY_POLL
> > > - hotkey_poll_setup(true);
> > > -#endif
> > > + hotkey_poll_setup_safe(true);
> > >
> > > return 0;
> > > }
> > > _
> > >
> >
> > How about the added call to volume_init?
> >
>
> I don't know what you mean.
>
You've fixed the hotkey_poll_setup to a hotkey_poll_setup_safe that has
just been added by a patch of mine to the function brightness_init. The
same has not been done to the call that has been added to the function
volume_init.
Attachment:
signature.asc
Description: Digital signature
