diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-12 09:05:35 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-12 09:05:35 +0200 |
| commit | 278554bd6579206921f5d8a523649a7a57f8850d (patch) | |
| tree | 4e6c527daf0910e455b3aa72e2c96b0479e430be /drivers/media/dvb/ttpci | |
| parent | ar9170: fix for driver-core ABI change (diff) | |
| parent | Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| download | linux-278554bd6579206921f5d8a523649a7a57f8850d.tar.xz linux-278554bd6579206921f5d8a523649a7a57f8850d.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wireless/ath/ar9170/usb.c
drivers/scsi/iscsi_tcp.c
net/ipv4/ipmr.c
Diffstat (limited to 'drivers/media/dvb/ttpci')
| -rw-r--r-- | drivers/media/dvb/ttpci/budget.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/media/dvb/ttpci/budget.c b/drivers/media/dvb/ttpci/budget.c index 9fdf26cc6998..1500210c06cf 100644 --- a/drivers/media/dvb/ttpci/budget.c +++ b/drivers/media/dvb/ttpci/budget.c @@ -643,9 +643,6 @@ static void frontend_init(struct budget *budget) &budget->i2c_adap, &tt1600_isl6423_config); - } else { - dvb_frontend_detach(budget->dvb_frontend); - budget->dvb_frontend = NULL; } } break; |