summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2010-03-10 15:21:01 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-12 15:52:30 -0800
commit15b2630c587dcea931f563deb50d617af96b4edb (patch)
tree40afabf6630608ec38eafd47d8257c80514b49bc
parent57584c5a3824a15f65d2b065d9f453fc1ae1dab7 (diff)
downloadlinux-3.10-15b2630c587dcea931f563deb50d617af96b4edb.tar.gz
linux-3.10-15b2630c587dcea931f563deb50d617af96b4edb.tar.bz2
linux-3.10-15b2630c587dcea931f563deb50d617af96b4edb.zip
drivers/block/floppy.c: remove unnecessary return and braces
Signed-off-by: Joe Perches <joe@perches.com> Cc: Stephen Hemminger <shemminger@vyatta.com> Cc: Jens Axboe <jens.axboe@oracle.com> Cc: Marcin Slusarz <marcin.slusarz@gmail.com> Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/block/floppy.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 1264102cdcb..00f3910e2d5 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -1796,10 +1796,8 @@ static void recalibrate_floppy(void)
debugt("recalibrate floppy:");
do_floppy = recal_interrupt;
output_byte(FD_RECALIBRATE);
- if (output_byte(UNIT(current_drive)) < 0) {
+ if (output_byte(UNIT(current_drive)) < 0)
reset_fdc();
- return;
- }
}
/*