diff options
| author | Scott Wood <scottwood@freescale.com> | 2014-04-08 21:20:01 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-04-08 21:20:01 (GMT) |
| commit | 46864e3149aabfe369f1c469951909b9dc7d53bf (patch) | |
| tree | 5a57c938836d6f2853beaa123d568d128ab76349 /drivers/pci | |
| parent | 63f2cd32fb5f8541636f47cc4c7c53cf8284851f (diff) | |
| parent | 948a4eec975b0f231c6a55eaaff3e3bdcf4cdf70 (diff) | |
| download | linux-fsl-qoriq-46864e3149aabfe369f1c469951909b9dc7d53bf.tar.xz | |
Merge branch 'sdk-kernel-3.12' into sdk-v1.6.x
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/pcie/aer/aerdrv_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pcie/aer/aerdrv_core.c b/drivers/pci/pcie/aer/aerdrv_core.c index 85ca36f..6b3a958 100644 --- a/drivers/pci/pcie/aer/aerdrv_core.c +++ b/drivers/pci/pcie/aer/aerdrv_core.c @@ -574,7 +574,7 @@ void aer_recover_queue(int domain, unsigned int bus, unsigned int devfn, }; spin_lock_irqsave(&aer_recover_ring_lock, flags); - if (kfifo_put(&aer_recover_ring, &entry)) + if (kfifo_put(&aer_recover_ring, entry)) schedule_work(&aer_recover_work); else pr_err("AER recover: Buffer overflow when recovering AER for %04x:%02x:%02x:%x\n", |