Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/devfs-2.6

[linux-2.6] / drivers / scsi / ibmmca.c

diff --git a/drivers/scsi/ibmmca.c b/drivers/scsi/ibmmca.c
index 0c6dc31bb14dee7fe66849da86d0d94c300b560c..497f6642b2dc55da4ba6c71ba23b9404d49e315e 100644 (file)
--- a/drivers/scsi/ibmmca.c
+++ b/drivers/scsi/ibmmca.c
@@ -760,7 +760,7 @@ static int device_inquiry(int host_index, int ldn)
                while (!got_interrupt(host_index))
                        barrier();
 
-               /*if command succesful, break */
+               /*if command successful, break */
                if ((stat_result(host_index) == IM_SCB_CMD_COMPLETED) || (stat_result(host_index) == IM_SCB_CMD_COMPLETED_WITH_RETRIES))
                        return 1;
        }
@@ -885,7 +885,7 @@ static int immediate_assign(int host_index, unsigned int pun, unsigned int lun,
                while (!got_interrupt(host_index))
                        barrier();
 
-               /*if command succesful, break */
+               /*if command successful, break */
                if (stat_result(host_index) == IM_IMMEDIATE_CMD_COMPLETED)
                        return 1;
        }
@@ -921,7 +921,7 @@ static int immediate_feature(int host_index, unsigned int speed, unsigned int ti
                        return 2;
                } else
                        global_command_error_excuse = 0;
-               /*if command succesful, break */
+               /*if command successful, break */
                if (stat_result(host_index) == IM_IMMEDIATE_CMD_COMPLETED)
                        return 1;
        }
@@ -959,7 +959,7 @@ static int immediate_reset(int host_index, unsigned int ldn)
                        /* did not work, finish */
                        return 1;
                }
-               /*if command succesful, break */
+               /*if command successful, break */
                if (stat_result(host_index) == IM_IMMEDIATE_CMD_COMPLETED)
                        return 1;
        }
@@ -2241,8 +2241,7 @@ static int __ibmmca_host_reset(Scsi_Cmnd * cmd)
        int host_index;
        unsigned long imm_command;
 
-       if (cmd == NULL)
-               BUG();
+       BUG_ON(cmd == NULL);
 
        ticks = IM_RESET_DELAY * HZ;
        shpnt = cmd->device->host;