diff options
| author | Patrick Boettcher <pb@linuxtv.org> | 2006-07-29 23:19:17 +0200 |
|---|---|---|
| committer | Patrick Boettcher <pb@linuxtv.org> | 2006-07-29 23:19:17 +0200 |
| commit | c24408cc95719ef0b47ac75a093dbe94ed11c844 (patch) | |
| tree | 120d3c3169a06e29c0e9ade996c039ed28a0cd53 /linux/drivers/media/dvb/dvb-usb/dibusb-common.c | |
| parent | 4160c5543da524c80c4d69301fc1a3348d752c9e (diff) | |
| parent | 88137b4b1d44eb37bac0b8a052f8d34c35a04bdc (diff) | |
| download | mediapointer-dvb-s2-c24408cc95719ef0b47ac75a093dbe94ed11c844.tar.gz mediapointer-dvb-s2-c24408cc95719ef0b47ac75a093dbe94ed11c844.tar.bz2 | |
merge from v4l-dvb.stk3000p
From: Patrick Boettcher <pb@linuxtv.org>
merge from v4l-dvb.stk3000p
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Diffstat (limited to 'linux/drivers/media/dvb/dvb-usb/dibusb-common.c')
| -rw-r--r-- | linux/drivers/media/dvb/dvb-usb/dibusb-common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/dvb/dvb-usb/dibusb-common.c b/linux/drivers/media/dvb/dvb-usb/dibusb-common.c index 21e7f4f05..390ced9ae 100644 --- a/linux/drivers/media/dvb/dvb-usb/dibusb-common.c +++ b/linux/drivers/media/dvb/dvb-usb/dibusb-common.c @@ -288,8 +288,8 @@ int dibusb_dib3000mc_tuner_attach (struct dvb_usb_device *d) tun_i2c = dib3000mc_get_tuner_i2c_master(d->fe, 1); if ((ret = mt2060_attach(d->fe, tun_i2c, &stk3000p_mt2060_config, if1)) != 0) { /* not found - use panasonic pll parameters */ - if ((ret = dvb_pll_attach(d->fe, 0x60, tun_i2c, &dvb_pll_env57h1xd5)) != 0) - return ret; + if (dvb_pll_attach(d->fe, 0x60, tun_i2c, &dvb_pll_env57h1xd5) == NULL) + return -ENOMEM; } else { st->mt2060_present = 1; /* set the correct parameters for the dib3000p */ |