From 6f26fb49e4228c4b9c659a23714a3ab65c469aaf Mon Sep 17 00:00:00 2001
From: "Youquan,Song" <youquan.song@linux.intel.com>
Date: Fri, 11 Dec 2009 18:42:35 -0500
Subject: [PATCH] --- yaml --- r: 178889 b: refs/heads/master c:
 46256f83d0d066f99ffde547f27473dfd2a78009 h: refs/heads/master i:   178887:
 3d443dfdf4ef1807782b7d7cdb7b1374cbaefada v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/pci/pcie/aer/aer_inject.c | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c201a085e5e6..6f1d6b2e27d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40da4186a53e59d801130156ecb89fc5830ff227
+refs/heads/master: 46256f83d0d066f99ffde547f27473dfd2a78009
diff --git a/trunk/drivers/pci/pcie/aer/aer_inject.c b/trunk/drivers/pci/pcie/aer/aer_inject.c
index 797d47809f7a..dd7155a037e7 100644
--- a/trunk/drivers/pci/pcie/aer/aer_inject.c
+++ b/trunk/drivers/pci/pcie/aer/aer_inject.c
@@ -413,8 +413,14 @@ static int aer_inject(struct aer_error_inj *einj)
 	if (ret)
 		goto out_put;
 
-	if (find_aer_device(rpdev, &edev))
+	if (find_aer_device(rpdev, &edev)) {
+		if (!get_service_data(edev)) {
+			printk(KERN_WARNING "AER service is not initialized\n");
+			ret = -EINVAL;
+			goto out_put;
+		}
 		aer_irq(-1, edev);
+	}
 	else
 		ret = -EINVAL;
 out_put: