Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99d19bb7 authored by Matt Mackall's avatar Matt Mackall Committed by James Bottomley
Browse files

[SCSI] random: remove redundant SA_SAMPLE_RANDOM from NinjaSCSI 



The scsi layer is already calling add_disk_randomness in scsi_end_request.

Signed-off-by: default avatarMatt Mackall <mpm@selenic.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 8d55a786

drivers/scsi/nsp32.c

+1 −2
Original line number Diff line number Diff line
@@ -2866,8 +2866,7 @@ static int nsp32_detect(struct scsi_host_template *sht) 
	 */

	nsp32_do_bus_reset(data);



	ret = request_irq(host->irq, do_nsp32_isr,

			  SA_SHIRQ | SA_SAMPLE_RANDOM, "nsp32", data);

	ret = request_irq(host->irq, do_nsp32_isr, SA_SHIRQ, "nsp32", data);

	if (ret < 0) {

		nsp32_msg(KERN_ERR, "Unable to allocate IRQ for NinjaSCSI32 "

			  "SCSI PCI controller. Interrupt: %d", host->irq);

drivers/scsi/pcmcia/nsp_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -1623,7 +1623,7 @@ static int nsp_cs_probe(struct pcmcia_device *link) 
	/* Interrupt handler */

	link->irq.Handler	 = &nspintr;

	link->irq.Instance       = info;

	link->irq.Attributes     |= (SA_SHIRQ | SA_SAMPLE_RANDOM);

	link->irq.Attributes     |= SA_SHIRQ;



	/* General socket configuration */

	link->conf.Attributes	 = CONF_ENABLE_IRQ;