From 27c184fa0a84012ec7aeef279adc8207f6238db0 Mon Sep 17 00:00:00 2001 From: Matt Mackall Date: Sun, 25 Jun 2006 05:47:11 -0700 Subject: [PATCH] --- yaml --- r: 29661 b: refs/heads/master c: 8bd0b97e95d378df57938d4773ad674194278ac1 h: refs/heads/master i: 29659: b6cee4dbe3aa5606c0c85682173623ca511748b2 v: v3 --- [refs] | 2 +- trunk/drivers/block/cciss.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2985ad5a0602..73a9366a7a99 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: afedfd016a78ea1b678886ab6236acbc7650fcfb +refs/heads/master: 8bd0b97e95d378df57938d4773ad674194278ac1 diff --git a/trunk/drivers/block/cciss.c b/trunk/drivers/block/cciss.c index 25c3c4a5da81..e2df9eb6b90d 100644 --- a/trunk/drivers/block/cciss.c +++ b/trunk/drivers/block/cciss.c @@ -1221,6 +1221,7 @@ static void cciss_softirq_done(struct request *rq) printk("Done with %p\n", rq); #endif /* CCISS_DEBUG */ + add_disk_randomness(rq->rq_disk); spin_lock_irqsave(&h->lock, flags); end_that_request_last(rq, rq->errors); cmd_free(h, cmd,1); @@ -3152,8 +3153,7 @@ static int __devinit cciss_init_one(struct pci_dev *pdev, /* make sure the board interrupts are off */ hba[i]->access.set_intr_mask(hba[i], CCISS_INTR_OFF); if( request_irq(hba[i]->intr[SIMPLE_MODE_INT], do_cciss_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 "cciss: Unable to get irq %d for %s\n", hba[i]->intr[SIMPLE_MODE_INT], hba[i]->devname); goto clean2;