diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /drivers/net/can/softing/softing_main.c | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'drivers/net/can/softing/softing_main.c')
| -rw-r--r-- | drivers/net/can/softing/softing_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/can/softing/softing_main.c b/drivers/net/can/softing/softing_main.c index aeea9f9ff6e8..7a70709d5608 100644 --- a/drivers/net/can/softing/softing_main.c +++ b/drivers/net/can/softing/softing_main.c | |||
| @@ -218,7 +218,7 @@ static int softing_handle_1(struct softing *card) | |||
| 218 | ptr = buf; | 218 | ptr = buf; |
| 219 | cmd = *ptr++; | 219 | cmd = *ptr++; |
| 220 | if (cmd == 0xff) | 220 | if (cmd == 0xff) |
| 221 | /* not quite usefull, probably the card has got out */ | 221 | /* not quite useful, probably the card has got out */ |
| 222 | return 0; | 222 | return 0; |
| 223 | netdev = card->net[0]; | 223 | netdev = card->net[0]; |
| 224 | if (cmd & CMD_BUS2) | 224 | if (cmd & CMD_BUS2) |