diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-13 17:44:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-13 17:44:51 -0400 |
| commit | 97fb44eb6bc01f4ffed4300e475aa15e44877375 (patch) | |
| tree | 481ed6efd0babe7185cae04f2fd295426b36411d /drivers/net/irda | |
| parent | e4707dd3e9d0cb57597b6568a5e51fea5d6fca41 (diff) | |
| parent | 148854c65ea8046b045672fd49f4333aefaa3ab5 (diff) | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel
Conflicts:
arch/arm/mach-at91/gpio.c
Diffstat (limited to 'drivers/net/irda')
| -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; |