Kaynağa Gözat

Merge "asoc:codecs: Update exit section in device init."

qctecmdr 2 yıl önce
ebeveyn
işleme
5454ad283a
1 değiştirilmiş dosya ile 3 ekleme ve 3 silme
  1. 3 3
      asoc/codecs/wcd9xxx-core.c

+ 3 - 3
asoc/codecs/wcd9xxx-core.c

@@ -631,12 +631,12 @@ static int wcd9xxx_device_init(struct wcd9xxx *wcd9xxx)
 	return ret;
 err_irq:
 	wcd9xxx_irq_exit(&wcd9xxx->core_res);
+err:
+    wcd9xxx_core_res_deinit(&wcd9xxx->core_res);
 fail_cdc_fill:
 	devm_kfree(wcd9xxx->dev, wcd9xxx->codec_type);
-	wcd9xxx->codec_type = NULL;
-err:
 	wcd9xxx_bringdown(wcd9xxx->dev);
-	wcd9xxx_core_res_deinit(&wcd9xxx->core_res);
+	wcd9xxx->codec_type = NULL;
 err_bring_up:
 	mutex_destroy(&wcd9xxx->io_lock);
 	mutex_destroy(&wcd9xxx->xfer_lock);