projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] BLOCK: Move the loop device ioctl compat stuff to the loop driver [try #6]
[powerpc.git]
/
drivers
/
block
/
floppy.c
diff --git
a/drivers/block/floppy.c
b/drivers/block/floppy.c
index
5109fa3
..
629c576
100644
(file)
--- a/
drivers/block/floppy.c
+++ b/
drivers/block/floppy.c
@@
-2991,8
+2991,8
@@
static void do_fd_request(request_queue_t * q)
if (usage_count == 0) {
printk("warning: usage count=0, current_req=%p exiting\n",
current_req);
if (usage_count == 0) {
printk("warning: usage count=0, current_req=%p exiting\n",
current_req);
- printk("sect=%ld
flags=%l
x\n", (long)current_req->sector,
- current_req->flags);
+ printk("sect=%ld
type=%x flags=%
x\n", (long)current_req->sector,
+ current_req->
cmd_type, current_req->cmd_
flags);
return;
}
if (test_bit(0, &fdc_busy)) {
return;
}
if (test_bit(0, &fdc_busy)) {
@@
-4177,6
+4177,11
@@
static int __init floppy_init(void)
int i, unit, drive;
int err, dr;
int i, unit, drive;
int err, dr;
+#if defined(CONFIG_PPC_MERGE)
+ if (check_legacy_ioport(FDC1))
+ return -ENODEV;
+#endif
+
raw_cmd = NULL;
for (dr = 0; dr < N_DRIVE; dr++) {
raw_cmd = NULL;
for (dr = 0; dr < N_DRIVE; dr++) {
@@
-4234,13
+4239,6
@@
static int __init floppy_init(void)
}
use_virtual_dma = can_use_virtual_dma & 1;
}
use_virtual_dma = can_use_virtual_dma & 1;
-#if defined(CONFIG_PPC_MERGE)
- if (check_legacy_ioport(FDC1)) {
- del_timer(&fd_timeout);
- err = -ENODEV;
- goto out_unreg_region;
- }
-#endif
fdc_state[0].address = FDC1;
if (fdc_state[0].address == -1) {
del_timer(&fd_timeout);
fdc_state[0].address = FDC1;
if (fdc_state[0].address == -1) {
del_timer(&fd_timeout);