diff options
| author | David S. Miller | 2008-05-15 09:34:44 +0200 |
|---|---|---|
| committer | David S. Miller | 2008-05-15 09:34:44 +0200 |
| commit | 63fe46da9c380b3f2bbdf3765044649517cc717c (patch) | |
| tree | 9478c1aca1d692b408955aea20c9cd9a37e589c0 /drivers/media/video/em28xx/em28xx-dvb.c | |
| parent | Merge branch 'upstream-next' of master.kernel.org:/pub/scm/linux/kernel/git/j... (diff) | |
| parent | isdn/capi: Return proper errnos on module init. (diff) | |
| download | kernel-qcow2-linux-63fe46da9c380b3f2bbdf3765044649517cc717c.tar.gz kernel-qcow2-linux-63fe46da9c380b3f2bbdf3765044649517cc717c.tar.xz kernel-qcow2-linux-63fe46da9c380b3f2bbdf3765044649517cc717c.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-4965-rs.c
drivers/net/wireless/rt2x00/rt61pci.c
Diffstat (limited to 'drivers/media/video/em28xx/em28xx-dvb.c')
| -rw-r--r-- | drivers/media/video/em28xx/em28xx-dvb.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/video/em28xx/em28xx-dvb.c b/drivers/media/video/em28xx/em28xx-dvb.c index 7df81575b7f2..8cf4983f0039 100644 --- a/drivers/media/video/em28xx/em28xx-dvb.c +++ b/drivers/media/video/em28xx/em28xx-dvb.c @@ -251,7 +251,6 @@ static int attach_xc3028(u8 addr, struct em28xx *dev) printk(KERN_ERR "%s/2: xc3028 attach failed\n", dev->name); dvb_frontend_detach(dev->dvb->frontend); - dvb_unregister_frontend(dev->dvb->frontend); dev->dvb->frontend = NULL; return -EINVAL; } |