diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/media/dvb/siano/smsdvb.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/media/dvb/siano/smsdvb.c')
| -rw-r--r-- | drivers/media/dvb/siano/smsdvb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/siano/smsdvb.c b/drivers/media/dvb/siano/smsdvb.c index b80d09b035a1..37c594f82782 100644 --- a/drivers/media/dvb/siano/smsdvb.c +++ b/drivers/media/dvb/siano/smsdvb.c | |||
| @@ -650,7 +650,7 @@ static int smsdvb_dvbt_set_frontend(struct dvb_frontend *fe, | |||
| 650 | if (status & FE_HAS_LOCK) | 650 | if (status & FE_HAS_LOCK) |
| 651 | return ret; | 651 | return ret; |
| 652 | 652 | ||
| 653 | /* previous tune didnt lock - enable LNA and tune again */ | 653 | /* previous tune didn't lock - enable LNA and tune again */ |
| 654 | sms_board_lna_control(client->coredev, 1); | 654 | sms_board_lna_control(client->coredev, 1); |
| 655 | } | 655 | } |
| 656 | 656 | ||