git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-fixes' into upstream
[pandora-kernel.git]
/
drivers
/
net
/
smc9194.c
diff --git
a/drivers/net/smc9194.c
b/drivers/net/smc9194.c
index
6cf16f3
..
8b0321f
100644
(file)
--- a/
drivers/net/smc9194.c
+++ b/
drivers/net/smc9194.c
@@
-523,8
+523,7
@@
static int smc_wait_to_send_packet( struct sk_buff * skb, struct net_device * de
length = skb->len;
if (length < ETH_ZLEN) {
- skb = skb_padto(skb, ETH_ZLEN);
- if (skb == NULL) {
+ if (skb_padto(skb, ETH_ZLEN)) {
netif_wake_queue(dev);
return 0;
}