From 2f293dcf1c1ba3a6588ad63a443bf5a289a2832f Mon Sep 17 00:00:00 2001
From: Karol Kozimor <sziwan@hell.org.pl>
Date: Sat, 30 Jul 2005 04:18:00 -0400
Subject: [PATCH] --- yaml --- r: 7804 b: refs/heads/master c:
 031ec77bf67e4bda994ef8ceba267be3295ffdb7 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/acpi/video.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0363d8d842db..0269999fef36 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e92310a930462c6e1611f35453f57357c42bde14
+refs/heads/master: 031ec77bf67e4bda994ef8ceba267be3295ffdb7
diff --git a/trunk/drivers/acpi/video.c b/trunk/drivers/acpi/video.c
index 2cf264fd52e0..7b10a7b070c9 100644
--- a/trunk/drivers/acpi/video.c
+++ b/trunk/drivers/acpi/video.c
@@ -1665,6 +1665,7 @@ static int
 acpi_video_bus_put_one_device(
 	struct acpi_video_device	*device)
 {
+	acpi_status status;
 	struct acpi_video_bus *video;
 
 	ACPI_FUNCTION_TRACE("acpi_video_bus_put_one_device");
@@ -1679,6 +1680,12 @@ acpi_video_bus_put_one_device(
 	up(&video->sem);
 	acpi_video_device_remove_fs(device->dev);
 
+	status = acpi_remove_notify_handler(device->handle,
+		ACPI_DEVICE_NOTIFY, acpi_video_device_notify);
+	if (ACPI_FAILURE(status))
+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+			"Error removing notify handler\n"));
+
 	return_VALUE(0);
 }