From patchwork Sat Dec 18 08:52:10 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 417911 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oBI8qVvh010852 for ; Sat, 18 Dec 2010 08:52:31 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753506Ab0LRIw2 (ORCPT ); Sat, 18 Dec 2010 03:52:28 -0500 Received: from mail-ww0-f44.google.com ([74.125.82.44]:35479 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751297Ab0LRIw1 (ORCPT ); Sat, 18 Dec 2010 03:52:27 -0500 Received: by wwa36 with SMTP id 36so1426933wwa.1 for ; Sat, 18 Dec 2010 00:52:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:mime-version:content-type:content-disposition:user-agent; bh=Jdlusgb5jDbw5RWO2X6IcyxjhU2HM4LSpyDsekplRpE=; b=ZKalEZUu+ZHW/ta2C988n+jT7X18oWZ8tea+6+he3wQnoM3us9qRDbI6AEepB/7biR JlQhcxfuWoy4GMUGE4rF8YGcTxb08NGdzBt6fJVoQ4LpxekPK4glS0Gt0Es9tNHt/pvl xqUkXuLkmcVJiI2cMJcCerbiRY7Q2MAMhOI2c= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=ZI6SyVnLKRe2hjyG2/tQ9c3U0UcWwsJB2mGBZu4jgYBkrabjp4tHzKP7jaI5vrGNLE /HtsyaRqNrVfPS+Cu4qNvm7UWADVK+M0LXNrvTTUNUrPxCD4EKfjfFyrYEFQtldjViFl DmWEQ7pPBVsdt+8bSkrzUCChLBgCH6UQLXpAk= Received: by 10.227.199.5 with SMTP id eq5mr1135103wbb.219.1292662346386; Sat, 18 Dec 2010 00:52:26 -0800 (PST) Received: from bicker ([41.202.225.144]) by mx.google.com with ESMTPS id f35sm929286wbf.20.2010.12.18.00.52.22 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 18 Dec 2010 00:52:25 -0800 (PST) Date: Sat, 18 Dec 2010 11:52:10 +0300 From: Dan Carpenter To: Kalle Valo Cc: "John W. Linville" , linux-wireless@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [patch -next] wl1251: wl12xx_get_platform_data() returns an ERR_PTR Message-ID: <20101218085210.GO1639@bicker> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) 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 (demeter1.kernel.org [140.211.167.41]); Sat, 18 Dec 2010 08:52:31 +0000 (UTC) diff --git a/drivers/net/wireless/wl1251/sdio.c b/drivers/net/wireless/wl1251/sdio.c index 596d90e..d550b5e 100644 --- a/drivers/net/wireless/wl1251/sdio.c +++ b/drivers/net/wireless/wl1251/sdio.c @@ -252,7 +252,7 @@ static int wl1251_sdio_probe(struct sdio_func *func, wl->if_ops = &wl1251_sdio_ops; wl12xx_board_data = wl12xx_get_platform_data(); - if (wl12xx_board_data != NULL) { + if (!IS_ERR(wl12xx_board_data)) { wl->set_power = wl12xx_board_data->set_power; wl->irq = wl12xx_board_data->irq; wl->use_eeprom = wl12xx_board_data->use_eeprom;