rpms/kernel/devel linux-2.6-acpi-dock-oops.patch, NONE, 1.1 kernel-2.6.spec, 1.3158, 1.3159

[Dave Jones (davej)]

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14913

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-acpi-dock-oops.patch 
Log Message:
* Tue May 15 2007 Dave Jones <davej at redhat.com>
- Fix ACPI dock oops (#154362) [cebbert]


linux-2.6-acpi-dock-oops.patch:

--- NEW FILE linux-2.6-acpi-dock-oops.patch ---
---
 drivers/acpi/dock.c |    6 ++++++
 1 file changed, 6 insertions(+)

--- 2.6.21-d390.orig/drivers/acpi/dock.c
+++ 2.6.21-d390/drivers/acpi/dock.c
@@ -698,6 +698,7 @@ static int dock_add(acpi_handle handle)
 	if (ret) {
 		printk(KERN_ERR PREFIX "Error %d registering dock device\n", ret);
 		kfree(dock_station);
+		dock_station = NULL;
 		return ret;
 	}
 	ret = device_create_file(&dock_device.dev, &dev_attr_docked);
@@ -705,6 +706,7 @@ static int dock_add(acpi_handle handle)
 		printk("Error %d adding sysfs file\n", ret);
 		platform_device_unregister(&dock_device);
 		kfree(dock_station);
+		dock_station = NULL;
 		return ret;
 	}
 	ret = device_create_file(&dock_device.dev, &dev_attr_undock);
@@ -713,6 +715,7 @@ static int dock_add(acpi_handle handle)
 		device_remove_file(&dock_device.dev, &dev_attr_docked);
 		platform_device_unregister(&dock_device);
 		kfree(dock_station);
+		dock_station = NULL;
 		return ret;
 	}
 
@@ -725,6 +728,7 @@ static int dock_add(acpi_handle handle)
 	dd = alloc_dock_dependent_device(handle);
 	if (!dd) {
 		kfree(dock_station);
+		dock_station = NULL;
 		ret = -ENOMEM;
 		goto dock_add_err_unregister;
 	}
@@ -752,6 +756,7 @@ dock_add_err_unregister:
 	device_remove_file(&dock_device.dev, &dev_attr_undock);
 	platform_device_unregister(&dock_device);
 	kfree(dock_station);
+	dock_station = NULL;
 	return ret;
 }
 
@@ -785,6 +790,7 @@ static int dock_remove(void)
 
 	/* free dock station memory */
 	kfree(dock_station);
+	dock_station = NULL;
 	return 0;
 }
 


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3158
retrieving revision 1.3159
diff -u -r1.3158 -r1.3159
--- kernel-2.6.spec	15 May 2007 18:33:45 -0000	1.3158
+++ kernel-2.6.spec	15 May 2007 18:48:10 -0000	1.3159
@@ -612,6 +612,7 @@
 
 # ACPI bits
 Patch2500: linux-2.6-acpi-clear-fadt_cstate-control.patch
+Patch2501: linux-2.6-acpi-dock-oops.patch
 
 # Add the new firewire stack. Diff between the v2.6.20 tag and commit
 # a0ab4547b23c09541bc47a294a1397b3b0415bfe in the linux1394 git tree.
@@ -1370,6 +1371,8 @@
 # ACPI patches
 # ACPI: Fix 2.6.21 boot regression on P4/HT
 %patch2500 -p1
+# Fix ACPI dock oops (#154362)
+%patch2501 -p1
 
 #
 # Patches 5000 to 6000 are reserved for new drivers that are about to
@@ -2343,6 +2346,9 @@
 
 %changelog
 * Tue May 15 2007 Dave Jones <davej at redhat.com>
+- Fix ACPI dock oops (#154362) [cebbert]
+
+* Tue May 15 2007 Dave Jones <davej at redhat.com>
 - Fix provides: issues (#227533) - Ville Skyttä
 
 * Tue May 15 2007 John W. Linville <linville at redhat.com>