From: Nicholas Krause <xerofoify@gmail.com>
To: gregkh@linuxfoundation.org
Cc: ben@decadent.org.uk, lisa@xenapiadmin.com,
valentina.manea.m@gmail.com, devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH] staging: rtl8192 Check for Null return from dev_skb_alloc
Date: Fri, 20 Jun 2014 12:49:55 -0400 [thread overview]
Message-ID: <1403282995-6688-1-git-send-email-xerofoify@gmail.com> (raw)
Checks for Null return from dev_skb_alloc if it returns Null,
fw_download returns false. Otherwise it returns true.Also
removed rt_status due to returning true of false directly.
Signed-off-by: Nicholas Krause <xerofoify@gmail.com>
---
drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
index 1a95d1f..affa89a 100644
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
@@ -36,7 +36,6 @@ static bool fw_download_code(struct net_device *dev, u8 *code_virtual_address,
u32 buffer_len)
{
struct r8192_priv *priv = rtllib_priv(dev);
- bool rt_status = true;
u16 frag_threshold;
u16 frag_length, frag_offset = 0;
int i;
@@ -59,7 +58,9 @@ static bool fw_download_code(struct net_device *dev, u8 *code_virtual_address,
bLastIniPkt = 1;
}
skb = dev_alloc_skb(frag_length + 4);
+ if (!skb)
+ return false;
memcpy((unsigned char *)(skb->cb), &dev, sizeof(dev));
tcb_desc = (struct cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
@@ -99,7 +100,7 @@ static bool fw_download_code(struct net_device *dev, u8 *code_virtual_address,
write_nic_byte(dev, TPPoll, TPPoll_CQ);
- return rt_status;
+ return true;
}
static bool CPUcheck_maincodeok_turnonCPU(struct net_device *dev)
--
1.9.1
next reply other threads:[~2014-06-20 16:50 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-20 16:49 Nicholas Krause [this message]
2014-06-20 19:53 ` [PATCH] staging: rtl8192 Check for Null return from dev_skb_alloc Dan Carpenter
-- strict thread matches above, loose matches on Subject: below --
2014-06-19 21:18 Nicholas Krause
2014-06-20 2:12 ` Nick Krause
2014-06-20 3:46 ` Nick Krause
2014-06-19 20:18 Nicholas Krause
2014-06-19 20:20 ` Nick Krause
2014-06-19 20:51 ` Joe Perches
2014-06-19 20:53 ` Joe Perches
2014-06-19 21:12 ` Nick Krause
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1403282995-6688-1-git-send-email-xerofoify@gmail.com \
--to=xerofoify@gmail.com \
--cc=ben@decadent.org.uk \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lisa@xenapiadmin.com \
--cc=valentina.manea.m@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.