diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
| commit | 8a87a0b6313109d2fea87b1271d497c954ce2ca8 (patch) | |
| tree | 1b7ae51ff681e27118590e9cab4bf0ce38f5d80e /drivers/media/dvb/b2c2/flexcop.c | |
| parent | e6a04466ba965875a6132700fabb2f2c0249c41a (diff) | |
| parent | 3b44f137b9a846c5452d9e6e1271b79b1dbcc942 (diff) | |
Merge by hand (whitespace conflicts in libata.h)
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/media/dvb/b2c2/flexcop.c')
| -rw-r--r-- | drivers/media/dvb/b2c2/flexcop.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/dvb/b2c2/flexcop.c b/drivers/media/dvb/b2c2/flexcop.c index 12873d435406..123ed96f6faa 100644 --- a/drivers/media/dvb/b2c2/flexcop.c +++ b/drivers/media/dvb/b2c2/flexcop.c | |||
| @@ -193,6 +193,7 @@ static void flexcop_reset(struct flexcop_device *fc) | |||
| 193 | v204 = fc->read_ibi_reg(fc,misc_204); | 193 | v204 = fc->read_ibi_reg(fc,misc_204); |
| 194 | v204.misc_204.Per_reset_sig = 0; | 194 | v204.misc_204.Per_reset_sig = 0; |
| 195 | fc->write_ibi_reg(fc,misc_204,v204); | 195 | fc->write_ibi_reg(fc,misc_204,v204); |
| 196 | msleep(1); | ||
| 196 | v204.misc_204.Per_reset_sig = 1; | 197 | v204.misc_204.Per_reset_sig = 1; |
| 197 | fc->write_ibi_reg(fc,misc_204,v204); | 198 | fc->write_ibi_reg(fc,misc_204,v204); |
| 198 | } | 199 | } |