diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-18 17:57:10 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-18 17:57:10 +0100 |
| commit | 91219a3b20325689eb80f7598cce2dc745db171d (patch) | |
| tree | 0d82f056a6b48e27a126556ac12204c84b728b02 /drivers/s390/cio/qdio_main.c | |
| parent | sysfs: create bin_attributes under the requested group (diff) | |
| parent | Linux 3.14-rc3 (diff) | |
| download | linux-91219a3b20325689eb80f7598cce2dc745db171d.tar.xz linux-91219a3b20325689eb80f7598cce2dc745db171d.zip | |
Merge 3.14-rc3 into driver-core-next
We want those fixes here for testing and development.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/s390/cio/qdio_main.c')
| -rw-r--r-- | drivers/s390/cio/qdio_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/cio/qdio_main.c b/drivers/s390/cio/qdio_main.c index c883a085c059..77466c4faabb 100644 --- a/drivers/s390/cio/qdio_main.c +++ b/drivers/s390/cio/qdio_main.c @@ -996,7 +996,7 @@ static void qdio_int_handler_pci(struct qdio_irq *irq_ptr) } } - if (!pci_out_supported(q)) + if (!(irq_ptr->qib.ac & QIB_AC_OUTBOUND_PCI_SUPPORTED)) return; for_each_output_queue(irq_ptr, q, i) { |