From bea2a82c51d76efcb5ef8733a857c59fa4fe7728 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 10 Dec 2008 08:27:19 +0100
Subject: [PATCH] --- yaml --- r: 120371 b: refs/heads/master c:
 44411e07c2ce1a755a756e10b592cd3ba02f99b3 h: refs/heads/master i:   120369:
 3e7191cc9e2e92cd5f7dbfafd35896c206f6bd2f   120367:
 e5e3dabe12152309aadd61c86e6924330e8f4c23 v: v3

---
 [refs]                               | 2 +-
 trunk/sound/pci/ca0106/ca0106_main.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 43e0e12518c5..f79aa4b4c106 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5da95273c2e63c9607652b5e8dd39808b6992d7c
+refs/heads/master: 44411e07c2ce1a755a756e10b592cd3ba02f99b3
diff --git a/trunk/sound/pci/ca0106/ca0106_main.c b/trunk/sound/pci/ca0106/ca0106_main.c
index cea8a7cdb1d5..c13aa41a35b4 100644
--- a/trunk/sound/pci/ca0106/ca0106_main.c
+++ b/trunk/sound/pci/ca0106/ca0106_main.c
@@ -1776,7 +1776,12 @@ static int snd_ca0106_resume(struct pci_dev *pci)
 
 	pci_set_power_state(pci, PCI_D0);
 	pci_restore_state(pci);
-	pci_enable_device(pci);
+
+	if (pci_enable_device(pci) < 0) {
+		snd_card_disconnect(card);
+		return -EIO;
+	}
+
 	pci_set_master(pci);
 
 	ca0106_init_chip(chip);