diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-02-17 08:24:46 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-02-17 08:24:46 -0500 |
| commit | 7fb3a069bc5d3577409c2ae89f89cd264ff85816 (patch) | |
| tree | 7fe3ba3b95faeecb01e4feafb9288ef4b523c6b3 /drivers/net/s2io.c | |
| parent | 291186e049d7f8178ad31d43c38a53889f25d79e (diff) | |
| parent | 9d3415a8cc76ff65c6602a121ac318432c5cd7ba (diff) | |
Merge branch 'fix/misc' into topic/misc
Conflicts:
sound/pci/hda/patch_realtek.c
Diffstat (limited to 'drivers/net/s2io.c')
| -rw-r--r-- | drivers/net/s2io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index cc4218667cb..3c4836d0898 100644 --- a/drivers/net/s2io.c +++ b/drivers/net/s2io.c | |||
| @@ -3421,7 +3421,7 @@ static int wait_for_cmd_complete(void __iomem *addr, u64 busy_bit, | |||
| 3421 | break; | 3421 | break; |
| 3422 | } | 3422 | } |
| 3423 | } else { | 3423 | } else { |
| 3424 | if (!(val64 & busy_bit)) { | 3424 | if (val64 & busy_bit) { |
| 3425 | ret = SUCCESS; | 3425 | ret = SUCCESS; |
| 3426 | break; | 3426 | break; |
| 3427 | } | 3427 | } |