From patchwork Mon Apr 12 22:21:40 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grazvydas Ignotas X-Patchwork-Id: 92103 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o3CMSP9n022514 for ; Mon, 12 Apr 2010 22:28:26 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754075Ab0DLW2Y (ORCPT ); Mon, 12 Apr 2010 18:28:24 -0400 Received: from mail-bw0-f219.google.com ([209.85.218.219]:38423 "EHLO mail-bw0-f219.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753866Ab0DLW2X (ORCPT ); Mon, 12 Apr 2010 18:28:23 -0400 Received: by bwz19 with SMTP id 19so4657bwz.21 for ; Mon, 12 Apr 2010 15:28:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=ZJfJS0cdQ5cd4BtZFQh3bmxpwnYA83bx7qvEcLuMXtg=; b=CMnxNSrm90w/GL7ftwfazCYq973IPSL+pOD0RaoAXe3xc031x2yHFAMD4dt0ED+X7b cPoD7SD5J0rKd0OrlPWTLzEaRGwbj6pqTQ9AyNjhXd51s1NAiONhBmVmX0RfXb0ALN1R 2zj8ewuEoxmAsnPsFcD/ZZGGKdSiVSoCiYVq0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=r1zgXXTDJ1d36QsjJ61nnxhSztGL6jsP/OF0VOpn+cro1i81cWnBTqgJ7A9EYqy/Ww ZwGWO9+WiP3/ZqBMJyt2bsIacMj6IfQiS2cibz1JNdnz6ZCM6ATZrs0UN7u7VsIaHQus ISuDZwkJ0EgZ9e55sKwO4IEF6aBN0OfeHtzhk= Received: by 10.204.161.199 with SMTP id s7mr5485063bkx.9.1271110903447; Mon, 12 Apr 2010 15:21:43 -0700 (PDT) Received: from localhost.localdomain (ip-88-119-226-136.static.b4net.lt [88.119.226.136]) by mx.google.com with ESMTPS id d5sm41324293bkd.1.2010.04.12.15.21.42 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 12 Apr 2010 15:21:43 -0700 (PDT) From: Grazvydas Ignotas To: "John W. Linville" Cc: linux-wireless@vger.kernel.org, Kalle Valo , Grazvydas Ignotas Subject: [PATCH] wl1251: don't require NVS data when EEPROM is used Date: Tue, 13 Apr 2010 01:21:40 +0300 Message-Id: <1271110900-18572-1-git-send-email-notasas@gmail.com> X-Mailer: git-send-email 1.6.3.3 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Mon, 12 Apr 2010 22:28:26 +0000 (UTC) diff --git a/drivers/net/wireless/wl12xx/wl1251_main.c b/drivers/net/wireless/wl12xx/wl1251_main.c index 7bc109d..99a983f 100644 --- a/drivers/net/wireless/wl12xx/wl1251_main.c +++ b/drivers/net/wireless/wl12xx/wl1251_main.c @@ -202,8 +202,8 @@ static int wl1251_chip_wakeup(struct wl1251 *wl) goto out; } - /* No NVS from netlink, try to get it from the filesystem */ - if (wl->nvs == NULL) { + if (wl->nvs == NULL && !wl->use_eeprom) { + /* No NVS from netlink, try to get it from the filesystem */ ret = wl1251_fetch_nvs(wl); if (ret < 0) goto out;