diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-11-27 14:40:51 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-11-27 14:40:51 +0300 |
| commit | acf403ecc4155153e5e2c1640be90fc166e56ba7 (patch) | |
| tree | e9655b84776cec00a4da077f5dd1e336dfd9c7c0 /drivers/media/tuners/xc5000.c | |
| parent | 69eba10e606a80665f8573221fec589430d9d1cb (diff) | |
| parent | b61f90eac1ff9d1b30497e611aba4651d4066706 (diff) | |
| download | linux-acf403ecc4155153e5e2c1640be90fc166e56ba7.tar.xz | |
Merge branch 'topic/usb-resume' into for-next
Merge the proper mixer resume support for quirk codes.
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) if (priv) { cancel_delayed_work(&priv->timer_sleep); - hybrid_tuner_release_state(priv); if (priv->firmware) release_firmware(priv->firmware); + hybrid_tuner_release_state(priv); } mutex_unlock(&xc5000_list_mutex); |