Merge branch 'fix/hda' into for-linus

[linux-2.6-omap-h63xx.git] / drivers / pci / hotplug / cpqphp_ctrl.c

diff --git a/drivers/pci/hotplug/cpqphp_ctrl.c b/drivers/pci/hotplug/cpqphp_ctrl.c
index a60a25290995e5f2c267f6a2f4da65e9122d858a..cc227a8c4b11911a7a1e25798d29af391ea8cd09 100644 (file)
--- a/drivers/pci/hotplug/cpqphp_ctrl.c
+++ b/drivers/pci/hotplug/cpqphp_ctrl.c
@@ -1954,7 +1954,7 @@ void cpqhp_pushbutton_thread(unsigned long slot)
                        return ;
                }
 
-               if (func != NULL && ctrl != NULL) {
+               if (ctrl != NULL) {
                        if (cpqhp_process_SI(ctrl, func) != 0) {
                                amber_LED_on(ctrl, hp_slot);
                                green_LED_off(ctrl, hp_slot);
@@ -2604,7 +2604,7 @@ static int configure_new_function(struct controller *ctrl, struct pci_func *func
                        for (cloop = 0; cloop < 4; cloop++) {
                                if (irqs.valid_INT & (0x01 << cloop)) {
                                        rc = cpqhp_set_irq(func->bus, func->device,
-                                                          0x0A + cloop, irqs.interrupt[cloop]);
+                                                          cloop + 1, irqs.interrupt[cloop]);
                                        if (rc)
                                                goto free_and_out;
                                }
@@ -2945,7 +2945,7 @@ static int configure_new_function(struct controller *ctrl, struct pci_func *func
                }
 
                if (!behind_bridge) {
-                       rc = cpqhp_set_irq(func->bus, func->device, temp_byte + 0x09, IRQ);
+                       rc = cpqhp_set_irq(func->bus, func->device, temp_byte, IRQ);
                        if (rc)
                                return 1;
                } else {