From 07b3c3aca61a4ca86995bee9cc91ec5d65cf677c Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Mon, 7 Nov 2011 19:31:47 -0800 Subject: [PATCH] --- yaml --- r: 277815 b: refs/heads/master c: 1eb54c8a0fa0061247f3bd327b320c3e20c97340 h: refs/heads/master i: 277813: ffde1e178f899e2b4132ab1c0fc8812d50573443 277811: 94bcfe3180f2a2182c689bc160bf53ab34e77b61 277807: d801f5ff09731be4128a4e4c4888dee8b1d0adbd v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/mwifiex/pcie.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index fa41c6e19816..d91fce6a257d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7d7ab02204ae2af26944ccd8a4c599756bdf0fc3 +refs/heads/master: 1eb54c8a0fa0061247f3bd327b320c3e20c97340 diff --git a/trunk/drivers/net/wireless/mwifiex/pcie.c b/trunk/drivers/net/wireless/mwifiex/pcie.c index d12d44055489..a2f32008f9a8 100644 --- a/trunk/drivers/net/wireless/mwifiex/pcie.c +++ b/trunk/drivers/net/wireless/mwifiex/pcie.c @@ -1228,9 +1228,12 @@ static int mwifiex_pcie_event_complete(struct mwifiex_adapter *adapter, if (!skb) return 0; - if (rdptr >= MWIFIEX_MAX_EVT_BD) + if (rdptr >= MWIFIEX_MAX_EVT_BD) { dev_err(adapter->dev, "event_complete: Invalid rdptr 0x%x\n", rdptr); + ret = -EINVAL; + goto done; + } /* Read the event ring write pointer set by firmware */ if (mwifiex_read_reg(adapter, REG_EVTBD_WRPTR, &wrptr)) {