From: Lebedev, Vladimir P <vladimir.p.lebedev@intel.com>
Date: Tue, 5 Sep 2006 15:49:13 +0000 (+0400)
Subject: ACPI: sbs: check for NULL device pointer
X-Git-Tag: v2.6.20-rc1~179^2~6^2~2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=963497c12acb4d43caa9751b9291b014eea51a1a;p=linux-2.6-omap-h63xx.git

ACPI: sbs: check for NULL device pointer

Signed-off-by: Len Brown <len.brown@intel.com>
---

diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c
index 62bef0b3b61..79f38f03677 100644
--- a/drivers/acpi/sbs.c
+++ b/drivers/acpi/sbs.c
@@ -1685,10 +1685,16 @@ static int acpi_sbs_add(struct acpi_device *device)
 
 int acpi_sbs_remove(struct acpi_device *device, int type)
 {
-	struct acpi_sbs *sbs = (struct acpi_sbs *)acpi_driver_data(device);
+	struct acpi_sbs *sbs = NULL;
 	int id;
 
-	if (!device || !sbs) {
+	if (!device) {
+		return -EINVAL;
+	}
+
+	sbs = (struct acpi_sbs *)acpi_driver_data(device);
+
+	if (!sbs) {
 		return -EINVAL;
 	}