diff options
| author | Mark Brown <broonie@kernel.org> | 2014-11-03 10:13:33 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-11-03 10:13:33 -0500 |
| commit | ebc01f593b58e1896150fc2e3cbdd0116323c52c (patch) | |
| tree | 23e905a3fdbee3fc8a66ef760b9ed5ef5455e9dd /drivers/media/tuners/xc5000.c | |
| parent | 3f7256fe5fc64132a2dd19695255c990aa2188cf (diff) | |
| parent | 0df1f2487d2f0d04703f142813d53615d62a1da4 (diff) | |
Merge tag 'v3.18-rc3' into asoc-sgtl5000
Linux 3.18-rc3
Diffstat (limited to 'drivers/media/tuners/xc5000.c')
| -rw-r--r-- | drivers/media/tuners/xc5000.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/tuners/xc5000.c b/drivers/media/tuners/xc5000.c index e44c8aba6074..803a0e63d47e 100644 --- a/drivers/media/tuners/xc5000.c +++ b/drivers/media/tuners/xc5000.c | |||
| @@ -1333,9 +1333,9 @@ static int xc5000_release(struct dvb_frontend *fe) | |||
| 1333 | 1333 | ||
| 1334 | if (priv) { | 1334 | if (priv) { |
| 1335 | cancel_delayed_work(&priv->timer_sleep); | 1335 | cancel_delayed_work(&priv->timer_sleep); |
| 1336 | hybrid_tuner_release_state(priv); | ||
| 1337 | if (priv->firmware) | 1336 | if (priv->firmware) |
| 1338 | release_firmware(priv->firmware); | 1337 | release_firmware(priv->firmware); |
| 1338 | hybrid_tuner_release_state(priv); | ||
| 1339 | } | 1339 | } |
| 1340 | 1340 | ||
| 1341 | mutex_unlock(&xc5000_list_mutex); | 1341 | mutex_unlock(&xc5000_list_mutex); |