| Message ID | 1451420268-15862-1-git-send-email-wuninsu@gmail.com |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | David Miller |
| Headers | show |
On Tue, Dec 29, 2015 at 10:17 PM, Insu Yun <wuninsu@gmail.com> wrote: Empty commit message? > Signed-off-by: Insu Yun <wuninsu@gmail.com> > --- > drivers/net/wireless/mwifiex/sdio.c | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/drivers/net/wireless/mwifiex/sdio.c b/drivers/net/wireless/mwifiex/sdio.c > index 78a8474..a8af72d 100644 > --- a/drivers/net/wireless/mwifiex/sdio.c > +++ b/drivers/net/wireless/mwifiex/sdio.c > @@ -2053,8 +2053,19 @@ static int mwifiex_init_sdio(struct mwifiex_adapter *adapter) > /* Allocate skb pointer buffers */ > card->mpa_rx.skb_arr = kzalloc((sizeof(void *)) * > card->mp_agg_pkt_limit, GFP_KERNEL); Just noticed: Looks like good candidate for kcalloc or kmalloc_array, whichever is suitable. > + if (!card->mpa_rx.skb_arr) { > + kfree(card->mp_regs); > + return -ENOMEM; > + } > + > card->mpa_rx.len_arr = kzalloc(sizeof(*card->mpa_rx.len_arr) * > card->mp_agg_pkt_limit, GFP_KERNEL); Ditto. > + if (!card->mpa_rx.len_arr) { > + kfree(card->mp_regs); > + kfree(card->mpa_rx.skb_arr); > + return -ENOMEM; > + } > + > ret = mwifiex_alloc_sdio_mpa_buffers(adapter, > card->mp_tx_agg_buf_size, > card->mp_rx_agg_buf_size); > -- > 1.9.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/
Andy Shevchenko <andy.shevchenko@gmail.com> writes: > On Tue, Dec 29, 2015 at 10:17 PM, Insu Yun <wuninsu@gmail.com> wrote: > > Empty commit message? Yeah, no empty commit log, please. And then you submit a new version remember to add v2, v3 and so on: http://kernelnewbies.org/FirstKernelPatch#head-5c81b3c517a1d0bbc24f92594cb734e155fcbbcb
diff --git a/drivers/net/wireless/mwifiex/sdio.c b/drivers/net/wireless/mwifiex/sdio.c index 78a8474..a8af72d 100644 --- a/drivers/net/wireless/mwifiex/sdio.c +++ b/drivers/net/wireless/mwifiex/sdio.c @@ -2053,8 +2053,19 @@ static int mwifiex_init_sdio(struct mwifiex_adapter *adapter) /* Allocate skb pointer buffers */ card->mpa_rx.skb_arr = kzalloc((sizeof(void *)) * card->mp_agg_pkt_limit, GFP_KERNEL); + if (!card->mpa_rx.skb_arr) { + kfree(card->mp_regs); + return -ENOMEM; + } + card->mpa_rx.len_arr = kzalloc(sizeof(*card->mpa_rx.len_arr) * card->mp_agg_pkt_limit, GFP_KERNEL); + if (!card->mpa_rx.len_arr) { + kfree(card->mp_regs); + kfree(card->mpa_rx.skb_arr); + return -ENOMEM; + } + ret = mwifiex_alloc_sdio_mpa_buffers(adapter, card->mp_tx_agg_buf_size, card->mp_rx_agg_buf_size);
Signed-off-by: Insu Yun <wuninsu@gmail.com> --- drivers/net/wireless/mwifiex/sdio.c | 11 +++++++++++ 1 file changed, 11 insertions(+)