summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-02-25 16:27:51 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2018-02-25 16:27:51 -0800
commit297ea1b7f717db660fa6eb543dc0af41f7bf8d57 (patch)
tree057e3f108390c113516782d9de85cc537f8a0872 /arch/powerpc/platforms
parentc89be5242607d8aa08a6fa45a887c68b2d4a2a2c (diff)
parented7158bae41044ff696e9aafd5ada46d391a5a2e (diff)
downloadop-kernel-dev-297ea1b7f717db660fa6eb543dc0af41f7bf8d57.zip
op-kernel-dev-297ea1b7f717db660fa6eb543dc0af41f7bf8d57.tar.gz
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull cleanup patchlet from Thomas Gleixner: "A single commit removing a bunch of bogus double semicolons all over the tree" * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: treewide/trivial: Remove ';;$' typo noise
Diffstat (limited to 'arch/powerpc/platforms')
-rw-r--r--arch/powerpc/platforms/powernv/pci-ioda.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c
index 496e476..a6c92c7 100644
--- a/arch/powerpc/platforms/powernv/pci-ioda.c
+++ b/arch/powerpc/platforms/powernv/pci-ioda.c
@@ -1854,7 +1854,7 @@ static int pnv_pci_ioda_dma_set_mask(struct pci_dev *pdev, u64 dma_mask)
s64 rc;
if (WARN_ON(!pdn || pdn->pe_number == IODA_INVALID_PE))
- return -ENODEV;;
+ return -ENODEV;
pe = &phb->ioda.pe_array[pdn->pe_number];
if (pe->tce_bypass_enabled) {
OpenPOWER on IntegriCloud