Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=89fc4eb924fc8da769083e1680e24c182589d789
Commit:     89fc4eb924fc8da769083e1680e24c182589d789
Parent:     94104aa2a88ac2433f7cbde3dbec629263724271
Author:     Hans Verkuil <[EMAIL PROTECTED]>
AuthorDate: Sat Aug 4 05:00:07 2007 -0300
Committer:  Mauro Carvalho Chehab <[EMAIL PROTECTED]>
CommitDate: Tue Oct 9 22:04:50 2007 -0300

    V4L/DVB (5993): cx25840: resetting also requires reloading the firmware
    
    Resetting without reloading the firmware is not enough. Sometimes the
    firmware is 'stuck' and needs to be reloaded.
    
    Signed-off-by: Hans Verkuil <[EMAIL PROTECTED]>
    Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
 drivers/media/video/cx25840/cx25840-core.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/media/video/cx25840/cx25840-core.c 
b/drivers/media/video/cx25840/cx25840-core.c
index 9c12bd3..9f99007 100644
--- a/drivers/media/video/cx25840/cx25840-core.c
+++ b/drivers/media/video/cx25840/cx25840-core.c
@@ -179,7 +179,7 @@ static void cx25836_initialize(struct i2c_client *client)
        cx25840_and_or(client, 0x15b, ~0x1e, 0x10);
 }
 
-static void cx25840_initialize(struct i2c_client *client, int loadfw)
+static void cx25840_initialize(struct i2c_client *client)
 {
        struct cx25840_state *state = i2c_get_clientdata(client);
 
@@ -197,8 +197,7 @@ static void cx25840_initialize(struct i2c_client *client, 
int loadfw)
        cx25840_write(client, 0x13c, 0x01);
        cx25840_write(client, 0x13c, 0x00);
        /* 5. */
-       if (loadfw)
-               cx25840_loadfw(client);
+       cx25840_loadfw(client);
        /* 6. */
        cx25840_write(client, 0x115, 0x8c);
        cx25840_write(client, 0x116, 0x07);
@@ -638,7 +637,7 @@ static int cx25840_command(struct i2c_client *client, 
unsigned int cmd,
                if (state->is_cx25836)
                        cx25836_initialize(client);
                else
-                       cx25840_initialize(client, 1);
+                       cx25840_initialize(client);
        }
 
        switch (cmd) {
@@ -841,7 +840,7 @@ static int cx25840_command(struct i2c_client *client, 
unsigned int cmd,
                if (state->is_cx25836)
                        cx25836_initialize(client);
                else
-                       cx25840_initialize(client, 0);
+                       cx25840_initialize(client);
                break;
 
        case VIDIOC_G_CHIP_IDENT:
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to