diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-01-23 18:22:16 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-01-24 19:27:32 +0100 |
| commit | 8a327f23e23fa509e6e3c2263ae1cc0a67dec387 (patch) | |
| tree | 119abf09e1ec9babaf78e6889187f9d54864b118 /drivers/media/dvb/frontends/ix2505v.c | |
| parent | drm/i915: Handle the no-interrupts case for UMS by polling (diff) | |
| parent | Merge branch 'BUG_ON' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/... (diff) | |
| download | linux-8a327f23e23fa509e6e3c2263ae1cc0a67dec387.tar.xz linux-8a327f23e23fa509e6e3c2263ae1cc0a67dec387.zip | |
Merge remote branch 'linus/master' into drm-intel-fixes
Merge with Linus to resolve conflicting fixes for the reusing the stale
HEAD value during intel_ring_wait().
Conflicts:
drivers/gpu/drm/i915/intel_ringbuffer.c
Diffstat (limited to 'drivers/media/dvb/frontends/ix2505v.c')
| -rw-r--r-- | drivers/media/dvb/frontends/ix2505v.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/frontends/ix2505v.c b/drivers/media/dvb/frontends/ix2505v.c index 6360c681ded9..6c2e929bd79f 100644 --- a/drivers/media/dvb/frontends/ix2505v.c +++ b/drivers/media/dvb/frontends/ix2505v.c @@ -311,7 +311,7 @@ struct dvb_frontend *ix2505v_attach(struct dvb_frontend *fe, return fe; error: - ix2505v_release(fe); + kfree(state); return NULL; } EXPORT_SYMBOL(ix2505v_attach); |