summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRandy Dunlap <rdunlap@xenotime.net>2006-06-25 14:48:56 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-25 19:01:20 +0200
commit18cddac3d17781d9cbc109522d70ab021c846e2b (patch)
tree32ef92afc51e17d67d124bb4b2372d3aebad20b2 /drivers
parent[PATCH] kernel-doc: warn on malformed function docs. (diff)
downloadlinux-18cddac3d17781d9cbc109522d70ab021c846e2b.tar.xz
linux-18cddac3d17781d9cbc109522d70ab021c846e2b.zip
[PATCH] ide-floppy: fix debug-only syntax error
Fix debug-only printk syntax error. Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to '')
-rw-r--r--drivers/ide/ide-floppy.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index a1179e924962..4656587aa2f7 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -1284,7 +1284,7 @@ static ide_startstop_t idefloppy_do_request (ide_drive_t *drive, struct request
debug_log(KERN_INFO "rq_status: %d, dev: %s, flags: %lx, errors: %d\n",
rq->rq_status,
- rq->rq_disk ? rq->rq_disk->disk_name ? "?",
+ rq->rq_disk ? rq->rq_disk->disk_name : "?",
rq->flags, rq->errors);
debug_log(KERN_INFO "sector: %ld, nr_sectors: %ld, "
"current_nr_sectors: %d\n", (long)rq->sector,