Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

[karo-tx-linux.git] / drivers / block / cciss_scsi.c

diff --git a/drivers/block/cciss_scsi.c b/drivers/block/cciss_scsi.c
index 3315268b4ec7debaa9733b725aa0de63100e29c6..5d0e46dc36320f701f816f825ca3563bedf6d3e9 100644 (file)
--- a/drivers/block/cciss_scsi.c
+++ b/drivers/block/cciss_scsi.c
@@ -755,7 +755,7 @@ complete_scsi_command( CommandList_struct *cp, int timeout, __u32 tag)
                                                cp,  
                                                ei->ScsiStatus); 
 #endif
-                                       cmd->result |= (ei->ScsiStatus < 1);
+                                       cmd->result |= (ei->ScsiStatus << 1);
                                }
                                else {  /* scsi status is zero??? How??? */
                                        
@@ -1547,7 +1547,7 @@ cciss_engage_scsi(int ctlr)
        if (sa->registered) {
                printk("cciss%d: SCSI subsystem already engaged.\n", ctlr);
                spin_unlock_irqrestore(CCISS_LOCK(ctlr), flags);
-               return ENXIO;
+               return -ENXIO;
        }
        sa->registered = 1;
        spin_unlock_irqrestore(CCISS_LOCK(ctlr), flags);