binfmt_misc: fix false -ENOEXEC when coupled with other binary handlers

[linux-2.6] / drivers / block / cciss.c

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 9ffa821fbfd71d80a7fe3fe3ea700af468c2a152..b73116ef92364e7993fba3c4bd2c5d164e2e6f1a 100644 (file)
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -3614,7 +3614,9 @@ static void __devexit cciss_remove_one(struct pci_dev *pdev)
                }
        }
 
+#ifdef CONFIG_CISS_SCSI_TAPE
        cciss_unregister_scsi(i);       /* unhook from SCSI subsystem */
+#endif
 
        cciss_shutdown(pdev);