Merge remote-tracking branch 'sound-asoc/for-next'

[deliverable/linux.git] / drivers / media / usb / cx231xx / cx231xx-cards.c

diff --git a/drivers/media/usb/cx231xx/cx231xx-cards.c b/drivers/media/usb/cx231xx/cx231xx-cards.c
index 72c246bfaa1c1cb5b8bfa9de5cb23802ed701676..36bc25494319dbf1b48d2414c1e0b3f76965dc64 100644 (file)
--- a/drivers/media/usb/cx231xx/cx231xx-cards.c
+++ b/drivers/media/usb/cx231xx/cx231xx-cards.c
@@ -1186,12 +1186,12 @@ static void cx231xx_unregister_media_device(struct cx231xx *dev)
 */
 void cx231xx_release_resources(struct cx231xx *dev)
 {
+       cx231xx_ir_exit(dev);
+
        cx231xx_release_analog_resources(dev);
 
        cx231xx_remove_from_devlist(dev);
 
-       cx231xx_ir_exit(dev);
-
        /* Release I2C buses */
        cx231xx_dev_uninit(dev);