--- linux-2.6.22/drivers/acpi/dock.c	2007-08-10 13:49:30.000000000 +0200
+++ linux-2.6.22/drivers/acpi/dock.c.orig	2007-08-10 13:49:15.000000000 +0200
@@ -716,7 +716,6 @@
 	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);
@@ -724,7 +723,6 @@
 		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);
@@ -733,7 +731,6 @@
 		device_remove_file(&dock_device.dev, &dev_attr_docked);
 		platform_device_unregister(&dock_device);
 		kfree(dock_station);
-		dock_station = NULL;
 		return ret;
 	}
 	ret = device_create_file(&dock_device.dev, &dev_attr_uid);
@@ -741,7 +738,6 @@
 		printk("Error %d adding sysfs file\n", ret);
 		platform_device_unregister(&dock_device);
 		kfree(dock_station);
-		dock_station = NULL;
 		return ret;
 	}
 
@@ -754,7 +750,6 @@
 	dd = alloc_dock_dependent_device(handle);
 	if (!dd) {
 		kfree(dock_station);
-		dock_station = NULL;
 		ret = -ENOMEM;
 		goto dock_add_err_unregister;
 	}
@@ -782,7 +777,6 @@
 	device_remove_file(&dock_device.dev, &dev_attr_undock);
 	platform_device_unregister(&dock_device);
 	kfree(dock_station);
-	dock_station = NULL;
 	return ret;
 }
 
@@ -816,7 +810,6 @@
 
 	/* free dock station memory */
 	kfree(dock_station);
-	dock_station = NULL;
 	return 0;
 }