]> err.no Git - linux-2.6/commitdiff
V4L/DVB (3320): Check if PLL-description is set
authorPatrick Boettcher <pb@linuxtv.org>
Mon, 9 Jan 2006 20:21:33 +0000 (18:21 -0200)
committerMauro Carvalho Chehab <mchehab@brturbo.com.br>
Mon, 9 Jan 2006 20:21:33 +0000 (18:21 -0200)
- Check if in the dvb-usb-device-structure the dvb_pll_desc is set before use.

Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
drivers/media/dvb/dvb-usb/dvb-usb-i2c.c

index da970947dfc72e5a77df1a4fa4a552c8ad16b038..9b254532af4dddd6e528c16c0a5770b3d8612173 100644 (file)
@@ -52,9 +52,8 @@ int dvb_usb_pll_init_i2c(struct dvb_frontend *fe)
        struct i2c_msg msg = { .addr = d->pll_addr, .flags = 0, .buf = d->pll_init, .len = 4 };
        int ret = 0;
 
-       /* if there is nothing to initialize */
-       if (d->pll_init[0] == 0x00 && d->pll_init[1] == 0x00 &&
-               d->pll_init[2] == 0x00 && d->pll_init[3] == 0x00)
+       /* if pll_desc is not used */
+       if (d->pll_desc == NULL)
                return 0;
 
        if (d->tuner_pass_ctrl)
@@ -80,6 +79,9 @@ int dvb_usb_pll_set(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep
 {
        struct dvb_usb_device *d = fe->dvb->priv;
 
+       if (d->pll_desc == NULL)
+               return 0;
+
        deb_pll("pll addr: %x, freq: %d %p\n",d->pll_addr,fep->frequency,d->pll_desc);
 
        b[0] = d->pll_addr << 1;