mirror of
https://github.com/followmsi/android_kernel_google_msm.git
synced 2024-11-06 23:17:41 +00:00
[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>
This commit is contained in:
parent
8bd0b97e95
commit
0f41a53a66
1 changed files with 3 additions and 2 deletions
|
@ -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);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue