diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2009-02-23 17:05:56 -0500 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2009-02-23 17:05:56 -0500 |
| commit | dc731ca60954310be0993e8992d450c7089fd13d (patch) | |
| tree | 6a997916f963d9e6dfa76fc5564296f57c3f909e /drivers/net/irda/mcs7780.c | |
| parent | ec5b3d32437571b8a742069a4cfd04edb6b6eda5 (diff) | |
| parent | 20f4d6c3a2a23c5d7d9cc7f42fbb943ca7a03d1f (diff) | |
Merge branch 'x86/urgent' into x86/mce2
Diffstat (limited to 'drivers/net/irda/mcs7780.c')
| -rw-r--r-- | drivers/net/irda/mcs7780.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/irda/mcs7780.c b/drivers/net/irda/mcs7780.c index 7eafdca19f34..85e88daab21a 100644 --- a/drivers/net/irda/mcs7780.c +++ b/drivers/net/irda/mcs7780.c | |||
| @@ -585,7 +585,7 @@ static int mcs_speed_change(struct mcs_cb *mcs) | |||
| 585 | mcs_get_reg(mcs, MCS_RESV_REG, &rval); | 585 | mcs_get_reg(mcs, MCS_RESV_REG, &rval); |
| 586 | } while(cnt++ < 100 && (rval & MCS_IRINTX)); | 586 | } while(cnt++ < 100 && (rval & MCS_IRINTX)); |
| 587 | 587 | ||
| 588 | if(cnt >= 100) { | 588 | if (cnt > 100) { |
| 589 | IRDA_ERROR("unable to change speed\n"); | 589 | IRDA_ERROR("unable to change speed\n"); |
| 590 | ret = -EIO; | 590 | ret = -EIO; |
| 591 | goto error; | 591 | goto error; |