From: Akinobu Mita Date: Sun, 27 May 2007 14:26:31 +0000 (+0900) Subject: [PATCH] softmac: alloc_ieee80211() NULL check X-Git-Tag: v2.6.22-rc4~90^2~7^2~1 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ef7ab2357ba09e8a795018640a87e93dfa043360;p=linux-2.6-omap-h63xx.git [PATCH] softmac: alloc_ieee80211() NULL check This patch adds missing NULL check and trims a line longer than 80 columns. Cc: Johannes Berg Cc: Joe Jezak Cc: Daniel Drake Signed-off-by: Akinobu Mita Signed-off-by: John W. Linville --- diff --git a/net/ieee80211/softmac/ieee80211softmac_module.c b/net/ieee80211/softmac/ieee80211softmac_module.c index e9cdc6615dd..c308756c2f9 100644 --- a/net/ieee80211/softmac/ieee80211softmac_module.c +++ b/net/ieee80211/softmac/ieee80211softmac_module.c @@ -33,7 +33,10 @@ struct net_device *alloc_ieee80211softmac(int sizeof_priv) struct ieee80211softmac_device *softmac; struct net_device *dev; - dev = alloc_ieee80211(sizeof(struct ieee80211softmac_device) + sizeof_priv); + dev = alloc_ieee80211(sizeof(*softmac) + sizeof_priv); + if (!dev) + return NULL; + softmac = ieee80211_priv(dev); softmac->dev = dev; softmac->ieee = netdev_priv(dev);