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 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
drivers
/
atm
/
solos-pci.c
diff --git
a/drivers/atm/solos-pci.c
b/drivers/atm/solos-pci.c
index
9359613
..
307321b
100644
(file)
--- a/
drivers/atm/solos-pci.c
+++ b/
drivers/atm/solos-pci.c
@@
-372,7
+372,7
@@
static int process_status(struct solos_card *card, int port, struct sk_buff *skb
}
snr = next_string(skb);
- if (!s
t
r)
+ if (!s
n
r)
return -EIO;
attn = next_string(skb);
if (!attn)