lkml.org 
[lkml]   [2006]   [Mar]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 065/141] V4L/DVB (3313): FIX: Check if FW was downloaded or not + new firmware file
    Date
    From: Patrick Boettcher <pb@linuxtv.org>
    Date: 1139302152 -0200

    - When a firmware was downloaded dvb_usb_device_init returns NULL for the
    dvb_usb_device, then nothing should be done with that pointer and device,
    because it will re-enumerate.
    - A new firmware should be used with digitv devices.
    - It should make "slave"-devices work and others, too.

    Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
    ---

    diff --git a/drivers/media/dvb/dvb-usb/digitv.c b/drivers/media/dvb/dvb-usb/digitv.c
    diff --git a/drivers/media/dvb/dvb-usb/digitv.c b/drivers/media/dvb/dvb-usb/digitv.c
    index e6c55c9..caa1346 100644
    --- a/drivers/media/dvb/dvb-usb/digitv.c
    +++ b/drivers/media/dvb/dvb-usb/digitv.c
    @@ -175,11 +175,13 @@ static int digitv_probe(struct usb_inter
    if ((ret = dvb_usb_device_init(intf,&digitv_properties,THIS_MODULE,&d)) == 0) {
    u8 b[4] = { 0 };

    - b[0] = 1;
    - digitv_ctrl_msg(d,USB_WRITE_REMOTE_TYPE,0,b,4,NULL,0);
    + if (d != NULL) { /* do that only when the firmware is loaded */
    + b[0] = 1;
    + digitv_ctrl_msg(d,USB_WRITE_REMOTE_TYPE,0,b,4,NULL,0);

    - b[0] = 0;
    - digitv_ctrl_msg(d,USB_WRITE_REMOTE,0,b,4,NULL,0);
    + b[0] = 0;
    + digitv_ctrl_msg(d,USB_WRITE_REMOTE,0,b,4,NULL,0);
    + }
    }
    return ret;
    }
    @@ -194,7 +196,7 @@ static struct dvb_usb_properties digitv_
    .caps = DVB_USB_IS_AN_I2C_ADAPTER,

    .usb_ctrl = CYPRESS_FX2,
    - .firmware = "dvb-usb-digitv-01.fw",
    + .firmware = "dvb-usb-digitv-02.fw",

    .size_of_priv = 0,

    @@ -229,6 +231,7 @@ static struct dvb_usb_properties digitv_
    { &digitv_table[0], NULL },
    { NULL },
    },
    + { NULL },
    }
    };

    -
    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: 2006-03-20 16:27    [W:4.134 / U:0.160 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site