diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-23 05:53:03 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-23 05:53:03 -0400 |
| commit | 009b9fc98ddd83f9139fdabb12c0d7a8535d5421 (patch) | |
| tree | f7d3e182407d2ebe50a9b8db6361ac910027a1cf /drivers/media/video/em28xx/em28xx-dvb.c | |
| parent | 3711ccb07b7f0a13f4f1aa16a8fdca9c930f21ca (diff) | |
| parent | 481c5346d0981940ee63037eb53e4e37b0735c10 (diff) | |
Merge branch 'linus' into x86/threadinfo
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) | |||
| 251 | printk(KERN_ERR "%s/2: xc3028 attach failed\n", | 251 | printk(KERN_ERR "%s/2: xc3028 attach failed\n", |
| 252 | dev->name); | 252 | dev->name); |
| 253 | dvb_frontend_detach(dev->dvb->frontend); | 253 | dvb_frontend_detach(dev->dvb->frontend); |
| 254 | dvb_unregister_frontend(dev->dvb->frontend); | ||
| 255 | dev->dvb->frontend = NULL; | 254 | dev->dvb->frontend = NULL; |
| 256 | return -EINVAL; | 255 | return -EINVAL; |
| 257 | } | 256 | } |