From patchwork Fri Oct 2 10:00:29 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Norbert Preining X-Patchwork-Id: 51324 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n92A0hth021506 for ; Fri, 2 Oct 2009 10:00:44 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757486AbZJBKAi (ORCPT ); Fri, 2 Oct 2009 06:00:38 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757485AbZJBKAi (ORCPT ); Fri, 2 Oct 2009 06:00:38 -0400 Received: from mx.logic.tuwien.ac.at ([128.130.175.19]:45831 "EHLO mx.logic.tuwien.ac.at" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757468AbZJBKAg (ORCPT ); Fri, 2 Oct 2009 06:00:36 -0400 Received: from d150-103.jaist.ac.jp ([150.65.150.103] helo=localhost ident=Debian-exim) by mx.logic.tuwien.ac.at with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1MtewD-0003J0-6p; Fri, 02 Oct 2009 12:00:34 +0200 Received: from norbert by localhost with local (Exim 4.69) (envelope-from ) id 1Mtew9-0001Oc-9A; Fri, 02 Oct 2009 19:00:29 +0900 Date: Fri, 2 Oct 2009 19:00:29 +0900 To: Alan Jenkins Cc: Johannes Berg , Mattia Dongili , "John W. Linville" , Greg Kroah-Hartman , linux-wireless@vger.kernel.org Subject: Re: sony-laptop: check for rfkill hard block at load time Message-ID: <20091002100029.GC4406@gandalf.dynalias.org> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) From: Norbert Preining Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org diff a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c --- a/drivers/platform/x86/sony-laptop.c +++ b/drivers/platform/x86/sony-laptop.c @@ -1044,6 +1044,9 @@ static int sony_nc_resume(struct acpi_device *device) sony_backlight_update_status(sony_backlight_device) < 0) printk(KERN_WARNING DRV_PFX "unable to restore brightness level\n"); + /* re-read rfkill state */ + sony_nc_rfkill_update(); + return 0; }