From d08c01b0792d6ac76ae629ad1c51d8aa9c3704f4 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Fri, 21 Dec 2007 06:35:55 -0300 Subject: [PATCH] --- yaml --- r: 75191 b: refs/heads/master c: c3c4c839336767da2d0c18e8e9bab33bef64ef8d h: refs/heads/master i: 75189: 41e876739bb6e7a0f3b20992794391952a09cac2 75187: 3999cc426150da4435bfb3741b75a8967f1fe4de 75183: cb90e307fd6d6019fb3af45cb28485a212649946 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/ivtv/ivtv-i2c.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f597c7f32aab..c996c9f8e63c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 867fee9b251f808c184a703ed4a56e8fb9afd741 +refs/heads/master: c3c4c839336767da2d0c18e8e9bab33bef64ef8d diff --git a/trunk/drivers/media/video/ivtv/ivtv-i2c.c b/trunk/drivers/media/video/ivtv/ivtv-i2c.c index 77b27dc750b1..44678fe27a04 100644 --- a/trunk/drivers/media/video/ivtv/ivtv-i2c.c +++ b/trunk/drivers/media/video/ivtv/ivtv-i2c.c @@ -718,6 +718,9 @@ int init_ivtv_i2c(struct ivtv *itv) sizeof(struct i2c_adapter)); memcpy(&itv->i2c_algo, &ivtv_i2c_algo_template, sizeof(struct i2c_algo_bit_data)); + /* The mspx4xx chips need a longer delay for some reason */ + if (itv->hw_flags & IVTV_HW_MSP34XX) + itv->i2c_algo.udelay = 10; itv->i2c_algo.data = itv; itv->i2c_adap.algo_data = &itv->i2c_algo; }