diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-09-16 06:48:32 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-09-16 06:48:32 +0200 |
| commit | ea88023b3491a384575ebcd5e8a449e841a28a24 (patch) | |
| tree | f46e3d8302e44dc55ce31823501e100472d29683 /drivers/atm/solos-pci.c | |
| parent | video: sh_mobile_lcdcfb: use both register sets for display panning (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6 (diff) | |
| download | linux-ea88023b3491a384575ebcd5e8a449e841a28a24.tar.xz linux-ea88023b3491a384575ebcd5e8a449e841a28a24.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/sh/kernel/vmlinux.lds.S
Diffstat (limited to 'drivers/atm/solos-pci.c')
| -rw-r--r-- | drivers/atm/solos-pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c index 9359613addc5..307321b32cb3 100644 --- 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 (!str) + if (!snr) return -EIO; attn = next_string(skb); if (!attn) |