All of lore.kernel.org
 help / color / mirror / Atom feed
From: Olof Johansson <olof@lixom.net>
To: Paul Mackerras <paulus@samba.org>
Cc: linuxppc-dev@ozlabs.org, torvalds@linux-foundation.org
Subject: [PATCH] [POWERPC] pasemi: Fix thinko in dma_direct_ops setup
Date: Thu, 31 Jan 2008 17:50:02 -0600	[thread overview]
Message-ID: <20080131235002.GA16753@lixom.net> (raw)
In-Reply-To: <20080131064130.GA32344@lixom.net>

[POWERPC] pasemi: Fix thinko in dma_direct_ops setup

The first patch will just fall through and still set dma_data to a bad
value, make it return directly instead.

Signed-off-by: Olof Johansson <olof@lixom.net>

---

Linus, thanks for picking up the patch so quickly. Unfortunately I
messed it up. Please apply this on top.


Thanks,

Olof

diff --git a/arch/powerpc/platforms/pasemi/iommu.c b/arch/powerpc/platforms/pasemi/iommu.c
index c5cfd4b..5803f11 100644
--- a/arch/powerpc/platforms/pasemi/iommu.c
+++ b/arch/powerpc/platforms/pasemi/iommu.c
@@ -184,7 +184,7 @@ static void pci_dma_dev_setup_pasemi(struct pci_dev *dev)
 	if (dev->vendor == 0x1959 && dev->device == 0xa007 &&
 	    !firmware_has_feature(FW_FEATURE_LPAR)) {
 		dev->dev.archdata.dma_ops = &dma_direct_ops;
-		dev->dev.archdata.dma_data = 0;
+		return;
 	}
 #endif
 

  parent reply	other threads:[~2008-01-31 23:49 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-01-31  1:23 Please pull powerpc.git for-2.6.25 branch Paul Mackerras
2008-01-31  3:34 ` [PATCH] [POWERPC] Fix compilation for CONFIG_DEBUGGER=n and CONFIG_KEXEC=y Olof Johansson
2008-01-31  6:41 ` [PATCH] [POWERPC] Set dma_data correctly for direct_ops on pasemi Olof Johansson
2008-01-31 12:38   ` Michael Ellerman
2008-01-31 16:18     ` Olof Johansson
2008-01-31 16:25   ` [PATCH v2] " Olof Johansson
2008-01-31 23:50   ` Olof Johansson [this message]
2008-02-01  7:56     ` [PATCH] [POWERPC] pasemi: Fix thinko in dma_direct_ops setup Michael Ellerman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080131235002.GA16753@lixom.net \
    --to=olof@lixom.net \
    --cc=linuxppc-dev@ozlabs.org \
    --cc=paulus@samba.org \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.