Commit 0f41a53a authored by Matt Mackall's avatar Matt Mackall Committed by Linus Torvalds
Browse files

[PATCH] random: change cpqarray to use add_disk_randomness 



Disk devices should use add_disk_randomness rather than SA_SAMPLE_RANDOM

Signed-off-by: default avatarMatt Mackall <mpm@selenic.com>
Cc: <mike.miller@hp.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 8bd0b97e

drivers/block/cpqarray.c

+3 −2
Original line number Diff line number Diff line
@@ -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);

}