Patch 2/2

This adds support for struct pci_driver shutdown and negates the previous NAK'ed
reboot_notifier patch. It's much easier, wish I had know about this before. 
Thanks to
Christoph for pointing this out.

Signed-off-by: Mike Miller <[EMAIL PROTECTED]>
------------------------------------------------------------------------------------------
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 916aab0..1abf1f5 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -3428,9 +3428,10 @@ static void __devexit cciss_remove_one(s
        memset(flush_buf, 0, 4);
        return_code = sendcmd(CCISS_CACHE_FLUSH, i, flush_buf, 4, 0, 0, 0, NULL,
                              TYPE_CMD);
-       if (return_code != IO_OK) {
-               printk(KERN_WARNING "Error Flushing cache on controller %d\n",
-                      i);
+       if (return_code = IO_OK) {
+               printk(KERN_WARNING "Completed cache flush on controller %d\n", 
i);
+       } else {
+               printk(KERN_WARNING "Error Flushing cache on controller %d\n", 
i);
        }
        free_irq(hba[i]->intr[2], hba[i]);
 
@@ -3481,6 +3482,7 @@ static struct pci_driver cciss_pci_drive
        .probe = cciss_init_one,
        .remove = __devexit_p(cciss_remove_one),
        .id_table = cciss_pci_device_id,        /* id_table */
+       .shutdown = cciss_remove_one,
 };
 
 /*
-
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to