Subject: scsi_error: fix indentation and braces disagreement - add braces From: Ilpo Järvinen Date: Fri Nov 7 11:18:27 2008 -0600: Git: 6ec39f02cf48df89c3cbab4aeef521569fec00e4 ...and the list of recent breakage goes on and on, this time it's 242f9dcb8ba6f (block: unify request timeout handling) which broke it. Signed-off-by: Ilpo Järvinen Acked-by: Jens Axboe Signed-off-by: James Bottomley Signed-off-by: Hannes Reinecke --- drivers/scsi/scsi_error.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/scsi/scsi_error.c +++ b/drivers/scsi/scsi_error.c @@ -139,7 +139,7 @@ enum blk_eh_timer_return scsi_times_out( else eh_timed_out = NULL; - if (eh_timed_out) + if (eh_timed_out) { rtn = eh_timed_out(scmd); switch (rtn) { case BLK_EH_NOT_HANDLED: @@ -147,6 +147,7 @@ enum blk_eh_timer_return scsi_times_out( default: return rtn; } + } if (unlikely(!scsi_eh_scmd_add(scmd, SCSI_EH_CANCEL_CMD))) { scmd->result |= DID_TIME_OUT << 16;