diff for duplicates of <20101004123146.GC5692@bicker> diff --git a/a/1.txt b/N1/1.txt index 74bf3b4..2869c67 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -10,7 +10,8 @@ index cb2552a..d04d760 100644 --- a/drivers/net/wireless/ipw2x00/ipw2200.c +++ b/drivers/net/wireless/ipw2x00/ipw2200.c @@ -11470,6 +11470,10 @@ static int ipw_net_init(struct net_device *dev) - bg_band->channels kzalloc(geo->bg_channels * + bg_band->channels = + kzalloc(geo->bg_channels * sizeof(struct ieee80211_channel), GFP_KERNEL); + if (!bg_band->channels) { + rc = -ENOMEM; @@ -20,7 +21,8 @@ index cb2552a..d04d760 100644 for (i = 0; i < geo->bg_channels; i++) { bg_band->channels[i].band = IEEE80211_BAND_2GHZ; @@ -11505,6 +11509,10 @@ static int ipw_net_init(struct net_device *dev) - a_band->channels kzalloc(geo->a_channels * + a_band->channels = + kzalloc(geo->a_channels * sizeof(struct ieee80211_channel), GFP_KERNEL); + if (!a_band->channels) { + rc = -ENOMEM; diff --git a/a/content_digest b/N1/content_digest index bb3c8d8..5d8364c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Dan Carpenter <error27@gmail.com>\0" "Subject\0[patch -next] ipw2200: check for allocation failures\0" - "Date\0Mon, 04 Oct 2010 12:31:46 +0000\0" + "Date\0Mon, 4 Oct 2010 14:31:46 +0200\0" "To\0John W. Linville <linville@tuxdriver.com>\0" "Cc\0Zhu Yi <yi.zhu@intel.com>" David S. Miller <davem@davemloft.net> @@ -20,7 +20,8 @@ "--- a/drivers/net/wireless/ipw2x00/ipw2200.c\n" "+++ b/drivers/net/wireless/ipw2x00/ipw2200.c\n" "@@ -11470,6 +11470,10 @@ static int ipw_net_init(struct net_device *dev)\n" - " \t\tbg_band->channels \t\t\tkzalloc(geo->bg_channels *\n" + " \t\tbg_band->channels =\n" + " \t\t\tkzalloc(geo->bg_channels *\n" " \t\t\t\tsizeof(struct ieee80211_channel), GFP_KERNEL);\n" "+\t\tif (!bg_band->channels) {\n" "+\t\t\trc = -ENOMEM;\n" @@ -30,7 +31,8 @@ " \t\tfor (i = 0; i < geo->bg_channels; i++) {\n" " \t\t\tbg_band->channels[i].band = IEEE80211_BAND_2GHZ;\n" "@@ -11505,6 +11509,10 @@ static int ipw_net_init(struct net_device *dev)\n" - " \t\ta_band->channels \t\t\tkzalloc(geo->a_channels *\n" + " \t\ta_band->channels =\n" + " \t\t\tkzalloc(geo->a_channels *\n" " \t\t\t\tsizeof(struct ieee80211_channel), GFP_KERNEL);\n" "+\t\tif (!a_band->channels) {\n" "+\t\t\trc = -ENOMEM;\n" @@ -40,4 +42,4 @@ " \t\tfor (i = 0; i < geo->a_channels; i++) {\n" " \t\t\ta_band->channels[i].band = IEEE80211_BAND_2GHZ;" -84631f7b147252e41661c659d19854d4c6187978bc3cc781161b8a7f4f5495d4 +1fbbc128fad60a1b38afb177922b17496f60c54225200f66d1cc0793ef5a1c87
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.