diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-06-12 22:34:34 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-06-12 22:34:34 -0400 |
| commit | b232923966f1210e1183353bbd1d52ee53b79fbf (patch) | |
| tree | e90c72b2cb400af53e1f92aff0af122782d7f65c /drivers/media/video/ivtv/ivtv-driver.c | |
| parent | bca1a5518cab2d58c766863c61ee4ef5f1cc4caa (diff) | |
| parent | 99f9f3d49cbc7d944476f6fde53a77ec789ab2aa (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/media/video/ivtv/ivtv-driver.c')
| -rw-r--r-- | drivers/media/video/ivtv/ivtv-driver.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c index e29f949adf5..efc66355339 100644 --- a/drivers/media/video/ivtv/ivtv-driver.c +++ b/drivers/media/video/ivtv/ivtv-driver.c @@ -652,6 +652,7 @@ static int __devinit ivtv_init_struct1(struct ivtv *itv) itv->dma_timer.data = (unsigned long)itv; itv->cur_dma_stream = -1; + itv->cur_pio_stream = -1; itv->audio_stereo_mode = AUDIO_STEREO; itv->audio_bilingual_mode = AUDIO_MONO_LEFT; |