diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-07-11 09:55:48 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-07-11 09:55:48 -0400 |
| commit | db1b39d8b860e3716620c225bc86e0ec41764e34 (patch) | |
| tree | 8739074db733ef767400ea92cfbfed9352ddb92d /drivers/block/amiflop.c | |
| parent | a6bc432e296dfa1f05d4b586ca5ca3085a2d42d7 (diff) | |
| parent | 4eb6bf6bfb580afaf1e1a1d30cba17a078530cf4 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/block/amiflop.c')
| -rw-r--r-- | drivers/block/amiflop.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c index 27a139025ced..6ce8b897e262 100644 --- a/drivers/block/amiflop.c +++ b/drivers/block/amiflop.c | |||
| @@ -1363,7 +1363,7 @@ static void redo_fd_request(void) | |||
| 1363 | #ifdef DEBUG | 1363 | #ifdef DEBUG |
| 1364 | printk("fd: sector %ld + %d requested for %s\n", | 1364 | printk("fd: sector %ld + %d requested for %s\n", |
| 1365 | CURRENT->sector,cnt, | 1365 | CURRENT->sector,cnt, |
| 1366 | (CURRENT->cmd==READ)?"read":"write"); | 1366 | (rq_data_dir(CURRENT) == READ) ? "read" : "write"); |
| 1367 | #endif | 1367 | #endif |
| 1368 | block = CURRENT->sector + cnt; | 1368 | block = CURRENT->sector + cnt; |
| 1369 | if ((int)block > floppy->blocks) { | 1369 | if ((int)block > floppy->blocks) { |