diff options
author | Gerd Knorr <devnull@localhost> | 2004-07-30 13:43:39 +0000 |
---|---|---|
committer | Gerd Knorr <devnull@localhost> | 2004-07-30 13:43:39 +0000 |
commit | 4df008f985ce28551d586721818b7a7a00b8b1dd (patch) | |
tree | a435231150c5e27b174891ffb6e0f8ddf17a40cc /linux/drivers/media/video/cx88/cx88-core.c | |
parent | 016aa2e20f1ca4b4f5430c4e945878b73a866894 (diff) | |
download | mediapointer-dvb-s2-4df008f985ce28551d586721818b7a7a00b8b1dd.tar.gz mediapointer-dvb-s2-4df008f985ce28551d586721818b7a7a00b8b1dd.tar.bz2 |
- cx88: more reorganization + code shuffeling.
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-core.c')
-rw-r--r-- | linux/drivers/media/video/cx88/cx88-core.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-core.c b/linux/drivers/media/video/cx88/cx88-core.c index b0d80a681..8661674fd 100644 --- a/linux/drivers/media/video/cx88/cx88-core.c +++ b/linux/drivers/media/video/cx88/cx88-core.c @@ -609,8 +609,7 @@ int cx88_reset(struct cx88_core *core) cx_write(MO_INT1_STAT, 0xFFFFFFFF); // Clear RISC int /* wait a bit */ - set_current_state(TASK_INTERRUPTIBLE); - schedule_timeout(HZ/10); + msleep(100); /* init sram */ cx88_sram_channel_setup(core, &cx88_sram_channels[SRAM_CH21], 720*4, 0); @@ -644,6 +643,11 @@ int cx88_reset(struct cx88_core *core) cx_write(MO_PCI_INTSTAT, 0xFFFFFFFF); // Clear PCI int cx_write(MO_INT1_STAT, 0xFFFFFFFF); // Clear RISC int + /* Reset on-board parts */ + cx_write(MO_SRST_IO, 0); + msleep(10); + cx_write(MO_SRST_IO, 1); + return 0; } |