aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/ataflop.c3
-rw-r--r--drivers/block/cciss_cmd.h2
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c
index 847a9e57570a..a5af1d6dda8b 100644
--- a/drivers/block/ataflop.c
+++ b/drivers/block/ataflop.c
@@ -1478,10 +1478,7 @@ void do_fd_request(struct request_queue * q)
1478 stdma_lock(floppy_irq, NULL); 1478 stdma_lock(floppy_irq, NULL);
1479 1479
1480 atari_disable_irq( IRQ_MFP_FDC ); 1480 atari_disable_irq( IRQ_MFP_FDC );
1481 local_save_flags(flags); /* The request function is called with ints
1482 local_irq_disable(); * disabled... so must save the IPL for later */
1483 redo_fd_request(); 1481 redo_fd_request();
1484 local_irq_restore(flags);
1485 atari_enable_irq( IRQ_MFP_FDC ); 1482 atari_enable_irq( IRQ_MFP_FDC );
1486} 1483}
1487 1484
diff --git a/drivers/block/cciss_cmd.h b/drivers/block/cciss_cmd.h
index b50a9b261b85..6afa700890ff 100644
--- a/drivers/block/cciss_cmd.h
+++ b/drivers/block/cciss_cmd.h
@@ -5,7 +5,7 @@
5//########################################################################### 5//###########################################################################
6#define CISS_VERSION "1.00" 6#define CISS_VERSION "1.00"
7 7
8//general boundary defintions 8//general boundary definitions
9#define SENSEINFOBYTES 32//note that this value may vary between host implementations 9#define SENSEINFOBYTES 32//note that this value may vary between host implementations
10#define MAXSGENTRIES 32 10#define MAXSGENTRIES 32
11#define CCISS_SG_CHAIN 0x80000000 11#define CCISS_SG_CHAIN 0x80000000