lkml.org 
[lkml]   [2004]   [Sep]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[patch 05/21] media/ovcamchip_core: replace schedule_timeout() with msleep()
    From
    Date



    Any comments would be appreciated.

    Description: Use msleep() instead of schedule_timeout() to
    guarantee the task delays as expected.

    Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>

    Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
    ---

    linux-2.6.9-rc2-bk7-max/drivers/media/video/ovcamchip/ovcamchip_core.c | 7 +++----
    1 files changed, 3 insertions(+), 4 deletions(-)

    diff -puN drivers/media/video/ovcamchip/ovcamchip_core.c~msleep-drivers_media_video_ovcamchip_ovcamchip_core drivers/media/video/ovcamchip/ovcamchip_core.c
    --- linux-2.6.9-rc2-bk7/drivers/media/video/ovcamchip/ovcamchip_core.c~msleep-drivers_media_video_ovcamchip_ovcamchip_core 2004-09-21 21:07:43.000000000 +0200
    +++ linux-2.6.9-rc2-bk7-max/drivers/media/video/ovcamchip/ovcamchip_core.c 2004-09-21 21:07:43.000000000 +0200
    @@ -15,6 +15,7 @@
    #include <linux/module.h>
    #include <linux/moduleparam.h>
    #include <linux/slab.h>
    +#include <linux/delay.h>
    #include "ovcamchip_priv.h"

    #define DRIVER_VERSION "v2.27 for Linux 2.6"
    @@ -128,8 +129,7 @@ static int init_camchip(struct i2c_clien
    ov_write(c, 0x12, 0x80);

    /* Wait for it to initialize */
    - set_current_state(TASK_UNINTERRUPTIBLE);
    - schedule_timeout(1 + 150 * HZ / 1000);
    + msleep(150);

    for (i = 0, success = 0; i < I2C_DETECT_RETRIES && !success; i++) {
    if (ov_read(c, GENERIC_REG_ID_HIGH, &high) >= 0) {
    @@ -145,8 +145,7 @@ static int init_camchip(struct i2c_clien
    ov_write(c, 0x12, 0x80);

    /* Wait for it to initialize */
    - set_current_state(TASK_UNINTERRUPTIBLE);
    - schedule_timeout(1 + 150 * HZ / 1000);
    + msleep(150);

    /* Dummy read to sync I2C */
    ov_read(c, 0x00, &low);
    _
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2005-03-22 14:06    [W:0.023 / U:29.900 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site