6 files changed, 29 insertions, 13 deletions

diff --git a/drivers/pci/hotplug/ibmphp.h b/drivers/pci/hotplug/ibmphp.h
index 5bc039da647f..c22e0284d7b1 100644
--- a/drivers/pci/hotplug/ibmphp.h
+++ b/drivers/pci/hotplug/ibmphp.h
@@ -196,7 +196,7 @@ struct ebda_hpc_bus {
 
 
 /********************************************************************
-*   THREE TYPE OF HOT PLUG CONTROLER                                *
+*   THREE TYPE OF HOT PLUG CONTROLLER                                *
 ********************************************************************/
 
 struct isa_ctlr_access {
diff --git a/drivers/pci/hotplug/ibmphp_hpc.c b/drivers/pci/hotplug/ibmphp_hpc.c
index 6894b548c8ca..1a3eb8d3d4cb 100644
--- a/drivers/pci/hotplug/ibmphp_hpc.c
+++ b/drivers/pci/hotplug/ibmphp_hpc.c
@@ -64,7 +64,7 @@ static int to_debug = FALSE;
 #define WPG_I2C_OR              0x2000  // I2C OR operation
 
 //----------------------------------------------------------------------------
-// Command set for I2C Master Operation Setup Regisetr
+// Command set for I2C Master Operation Setup Register
 //----------------------------------------------------------------------------
 #define WPG_READATADDR_MASK     0x00010000      // read,bytes,I2C shifted,index
 #define WPG_WRITEATADDR_MASK    0x40010000      // write,bytes,I2C shifted,index
@@ -835,7 +835,7 @@ static void poll_hpc (void)
                 if (ibmphp_shutdown) 
                         break;
                 
-                /* try to get the lock to do some kind of harware access */
+                /* try to get the lock to do some kind of hardware access */
                 down (&semOperations);
 
                 switch (poll_state) {
@@ -906,7 +906,7 @@ static void poll_hpc (void)
                                 poll_state = POLL_LATCH_REGISTER;
                         break;
                 }       
-                /* give up the harware semaphore */
+                /* give up the hardware semaphore */
                 up (&semOperations);
                 /* sleep for a short time just for good measure */
                 msleep(100);
diff --git a/drivers/pci/hotplug/ibmphp_pci.c b/drivers/pci/hotplug/ibmphp_pci.c
index 2335fac65fb4..8122fe734aa7 100644
--- a/drivers/pci/hotplug/ibmphp_pci.c
+++ b/drivers/pci/hotplug/ibmphp_pci.c
@@ -1308,10 +1308,10 @@ static int unconfigure_boot_device (u8 busno, u8 device, u8 function)
                         /* ????????? DO WE NEED TO WRITE ANYTHING INTO THE PCI CONFIG SPACE BACK ?????????? */
                 } else {
                         /* This is Memory */
-                        start_address &= PCI_BASE_ADDRESS_MEM_MASK;
                         if (start_address & PCI_BASE_ADDRESS_MEM_PREFETCH) {
                                 /* pfmem */
                                 debug ("start address of pfmem is %x\n", start_address);
+                                start_address &= PCI_BASE_ADDRESS_MEM_MASK;
 
                                 if (ibmphp_find_resource (bus, start_address, &pfmem, PFMEM) < 0) {
                                         err ("cannot find corresponding PFMEM resource to remove\n");
@@ -1325,6 +1325,8 @@ static int unconfigure_boot_device (u8 busno, u8 device, u8 function)
                         } else {
                                 /* regular memory */
                                 debug ("start address of mem is %x\n", start_address);
+                                start_address &= PCI_BASE_ADDRESS_MEM_MASK;
+
                                 if (ibmphp_find_resource (bus, start_address, &mem, MEM) < 0) {
                                         err ("cannot find corresponding MEM resource to remove\n");
                                         return -EIO;
@@ -1422,9 +1424,9 @@ static int unconfigure_boot_bridge (u8 busno, u8 device, u8 function)
                         /* ????????? DO WE NEED TO WRITE ANYTHING INTO THE PCI CONFIG SPACE BACK ?????????? */
                 } else {
                         /* This is Memory */
-                        start_address &= PCI_BASE_ADDRESS_MEM_MASK;
                         if (start_address & PCI_BASE_ADDRESS_MEM_PREFETCH) {
                                 /* pfmem */
+                                start_address &= PCI_BASE_ADDRESS_MEM_MASK;
                                 if (ibmphp_find_resource (bus, start_address, &pfmem, PFMEM) < 0) {
                                         err ("cannot find corresponding PFMEM resource to remove\n");
                                         return -EINVAL;
@@ -1436,6 +1438,7 @@ static int unconfigure_boot_bridge (u8 busno, u8 device, u8 function)
                                 }
                         } else {
                                 /* regular memory */
+                                start_address &= PCI_BASE_ADDRESS_MEM_MASK;
                                 if (ibmphp_find_resource (bus, start_address, &mem, MEM) < 0) {
                                         err ("cannot find corresponding MEM resource to remove\n");
                                         return -EINVAL;
diff --git a/drivers/pci/hotplug/pci_hotplug.h b/drivers/pci/hotplug/pci_hotplug.h
index 57ace325168d..88d44f7fef29 100644
--- a/drivers/pci/hotplug/pci_hotplug.h
+++ b/drivers/pci/hotplug/pci_hotplug.h
@@ -150,7 +150,7 @@ struct hotplug_slot_info {
  * @name: the name of the slot being registered.  This string must
  * be unique amoung slots registered on this system.
  * @ops: pointer to the &struct hotplug_slot_ops to be used for this slot
- * @info: pointer to the &struct hotplug_slot_info for the inital values for
+ * @info: pointer to the &struct hotplug_slot_info for the initial values for
  * this slot.
  * @release: called during pci_hp_deregister to free memory allocated in a
  * hotplug_slot structure.
diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
index 72baf749e65e..ed1fd8d6178d 100644
--- a/drivers/pci/hotplug/pciehp_core.c
+++ b/drivers/pci/hotplug/pciehp_core.c
@@ -90,6 +90,22 @@ static struct hotplug_slot_ops pciehp_hotplug_slot_ops = {
         .get_cur_bus_speed =    get_cur_bus_speed,
 };
 
+/**
+ * release_slot - free up the memory used by a slot
+ * @hotplug_slot: slot to free
+ */
+static void release_slot(struct hotplug_slot *hotplug_slot)
+{
+        struct slot *slot = hotplug_slot->private;
+
+        dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
+
+        kfree(slot->hotplug_slot->info);
+        kfree(slot->hotplug_slot->name);
+        kfree(slot->hotplug_slot);
+        kfree(slot);
+}
+
 static int init_slots(struct controller *ctrl)
 {
         struct slot *new_slot;
@@ -139,7 +155,8 @@ static int init_slots(struct controller *ctrl)
 
                 /* register this slot with the hotplug pci core */
                 new_slot->hotplug_slot->private = new_slot;
-                make_slot_name (new_slot->hotplug_slot->name, SLOT_NAME_SIZE, new_slot);
+                new_slot->hotplug_slot->release = &release_slot;
+                make_slot_name(new_slot->hotplug_slot->name, SLOT_NAME_SIZE, new_slot);
                 new_slot->hotplug_slot->ops = &pciehp_hotplug_slot_ops;
 
                 new_slot->hpc_ops->get_power_status(new_slot, &(new_slot->hotplug_slot->info->power_status));
@@ -188,10 +205,6 @@ static int cleanup_slots (struct controller * ctrl)
         while (old_slot) {
                 next_slot = old_slot->next;
                 pci_hp_deregister (old_slot->hotplug_slot);
-                kfree(old_slot->hotplug_slot->info);
-                kfree(old_slot->hotplug_slot->name);
-                kfree(old_slot->hotplug_slot);
-                kfree(old_slot);
                 old_slot = next_slot;
         }
 
diff --git a/drivers/pci/hotplug/pcihp_skeleton.c b/drivers/pci/hotplug/pcihp_skeleton.c
index 6605d6bda529..3194d51c6ec9 100644
--- a/drivers/pci/hotplug/pcihp_skeleton.c
+++ b/drivers/pci/hotplug/pcihp_skeleton.c
@@ -297,7 +297,7 @@ static int __init init_slots(void)
                 hotplug_slot->ops = &skel_hotplug_slot_ops;
                 
                 /*
-                 * Initilize the slot info structure with some known
+                 * Initialize the slot info structure with some known
                  * good values.
                  */
                 info->power_status = get_power_status(slot);