diff options
| author | Christoph Hellwig <hch@lst.de> | 2015-12-07 09:56:36 -0500 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2015-12-11 14:52:27 -0500 |
| commit | 0bc92ace52ef3ed1c8eb9bcf36cd3d7ca72d5d14 (patch) | |
| tree | 0a76114d5562b687843015ee8c6c2c1ce87c68ec /lib | |
| parent | ea51190c03150fce4d9e428bfb608abbe0991db8 (diff) | |
irq_poll: fold irq_poll_disable_pending into irq_poll_softirq
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Bart Van Assche <bart.vanassche@sandisk.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/irq_poll.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/irq_poll.c b/lib/irq_poll.c index 43a3370a09fd..53d67e341ebb 100644 --- a/lib/irq_poll.c +++ b/lib/irq_poll.c | |||
| @@ -122,7 +122,7 @@ static void irq_poll_softirq(struct softirq_action *h) | |||
| 122 | * move the instance around on the list at-will. | 122 | * move the instance around on the list at-will. |
| 123 | */ | 123 | */ |
| 124 | if (work >= weight) { | 124 | if (work >= weight) { |
| 125 | if (irq_poll_disable_pending(iop)) | 125 | if (test_bit(IRQ_POLL_F_DISABLE, &iop->state)) |
| 126 | __irq_poll_complete(iop); | 126 | __irq_poll_complete(iop); |
| 127 | else | 127 | else |
| 128 | list_move_tail(&iop->list, list); | 128 | list_move_tail(&iop->list, list); |
