diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
| commit | 24bfb00123e82a2e70bd115277d922438813515b (patch) | |
| tree | 27328b8a5718e16d64e2d101f4b7ddcad5930aed /drivers/media/dvb/frontends/l64781.c | |
| parent | c6135234550ed89a6fd0e8cb229633967e41d649 (diff) | |
| parent | 3f00d3e8fb963968a922d821a9a53b503b687e81 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/media/dvb/frontends/l64781.c')
| -rw-r--r-- | drivers/media/dvb/frontends/l64781.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/dvb/frontends/l64781.c b/drivers/media/dvb/frontends/l64781.c index faaad1ae855..19b4bf7c21a 100644 --- a/drivers/media/dvb/frontends/l64781.c +++ b/drivers/media/dvb/frontends/l64781.c | |||
| @@ -559,7 +559,8 @@ struct dvb_frontend* l64781_attach(const struct l64781_config* config, | |||
| 559 | return &state->frontend; | 559 | return &state->frontend; |
| 560 | 560 | ||
| 561 | error: | 561 | error: |
| 562 | if (reg0x3e >= 0) l64781_writereg (state, 0x3e, reg0x3e); /* restore reg 0x3e */ | 562 | if (reg0x3e >= 0) |
| 563 | l64781_writereg (state, 0x3e, reg0x3e); /* restore reg 0x3e */ | ||
| 563 | kfree(state); | 564 | kfree(state); |
| 564 | return NULL; | 565 | return NULL; |
| 565 | } | 566 | } |