diff options
| author | Matt Mackall <mpm@selenic.com> | 2006-06-25 05:47:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-25 10:01:00 -0700 |
| commit | 0f41a53a6699209216327cd4b506711610ad24c5 (patch) | |
| tree | 8f10fa4f404053e2bd4cb057fb4d2797c27d8d5a /drivers | |
| parent | 8bd0b97e95d378df57938d4773ad674194278ac1 (diff) | |
| download | linux-0f41a53a6699209216327cd4b506711610ad24c5.tar.bz2 | |
[PATCH] random: change cpqarray to use add_disk_randomness
Disk devices should use add_disk_randomness rather than SA_SAMPLE_RANDOM
Signed-off-by: Matt Mackall <mpm@selenic.com>
Cc: <mike.miller@hp.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/block/cpqarray.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c index b6ea2f0c7276..79d4184658df 100644 --- a/drivers/block/cpqarray.c +++ b/drivers/block/cpqarray.c @@ -410,8 +410,7 @@ static int cpqarray_register_ctlr( int i, struct pci_dev *pdev) } hba[i]->access.set_intr_mask(hba[i], 0); if (request_irq(hba[i]->intr, do_ida_intr, - SA_INTERRUPT|SA_SHIRQ|SA_SAMPLE_RANDOM, - hba[i]->devname, hba[i])) + SA_INTERRUPT|SA_SHIRQ, hba[i]->devname, hba[i])) { printk(KERN_ERR "cpqarray: Unable to get irq %d for %s\n", hba[i]->intr, hba[i]->devname); @@ -1036,6 +1035,8 @@ static inline void complete_command(cmdlist_t *cmd, int timeout) complete_buffers(cmd->rq->bio, ok); + add_disk_randomness(cmd->rq->rq_disk); + DBGPX(printk("Done with %p\n", cmd->rq);); end_that_request_last(cmd->rq, ok ? 1 : -EIO); } |