diff --git a/[refs] b/[refs] index 4f6705193453..7e0efe6ebbc9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2be1dc215bd34faf4895e4396dab924a24e10944 +refs/heads/master: 923de84ab07cfcee75946191f17a6e7fb98e3ac8 diff --git a/trunk/drivers/platform/x86/ideapad-laptop.c b/trunk/drivers/platform/x86/ideapad-laptop.c index 0a1ceaa9062e..ab3add3327ad 100644 --- a/trunk/drivers/platform/x86/ideapad-laptop.c +++ b/trunk/drivers/platform/x86/ideapad-laptop.c @@ -284,9 +284,8 @@ static struct rfkill_ops ideapad_rfk_ops = { .set_block = ideapad_rfk_set, }; -static void ideapad_sync_rfk_state(struct acpi_device *adevice) +static void ideapad_sync_rfk_state(struct ideapad_private *priv) { - struct ideapad_private *priv = dev_get_drvdata(&adevice->dev); unsigned long hw_blocked; int i; @@ -577,7 +576,7 @@ static int __devinit ideapad_acpi_add(struct acpi_device *adevice) else priv->rfk[i] = NULL; } - ideapad_sync_rfk_state(adevice); + ideapad_sync_rfk_state(priv); if (!acpi_video_backlight_support()) { ret = ideapad_backlight_init(priv); @@ -630,7 +629,7 @@ static void ideapad_acpi_notify(struct acpi_device *adevice, u32 event) if (test_bit(vpc_bit, &vpc1)) { switch (vpc_bit) { case 9: - ideapad_sync_rfk_state(adevice); + ideapad_sync_rfk_state(priv); break; case 4: ideapad_backlight_notify_brightness(priv);