All of lore.kernel.org
 help / color / mirror / Atom feed
From: Heikki Krogerus <heikki.krogerus@linux.intel.com>
To: Felipe Balbi <balbi@ti.com>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>,
	linux-usb@vger.kernel.org, linux-acpi@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: [resend PATCH 2/3] usb: dwc3: core: only setting the dma_mask when needed
Date: Wed, 24 Sep 2014 11:00:38 +0300	[thread overview]
Message-ID: <1411545639-18741-3-git-send-email-heikki.krogerus@linux.intel.com> (raw)
In-Reply-To: <1411545639-18741-1-git-send-email-heikki.krogerus@linux.intel.com>

If the probe drivers have already set the dma_mask, not
replacing the value.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
---
 drivers/usb/dwc3/core.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index b0f4d52..d08cac5 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -708,9 +708,11 @@ static int dwc3_probe(struct platform_device *pdev)
 	spin_lock_init(&dwc->lock);
 	platform_set_drvdata(pdev, dwc);
 
-	dev->dma_mask	= dev->parent->dma_mask;
-	dev->dma_parms	= dev->parent->dma_parms;
-	dma_set_coherent_mask(dev, dev->parent->coherent_dma_mask);
+	if (!dev->dma_mask) {
+		dev->dma_mask = dev->parent->dma_mask;
+		dev->dma_parms = dev->parent->dma_parms;
+		dma_set_coherent_mask(dev, dev->parent->coherent_dma_mask);
+	}
 
 	pm_runtime_enable(dev);
 	pm_runtime_get_sync(dev);
-- 
2.1.0

  parent reply	other threads:[~2014-09-24  8:00 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-24  8:00 [resend PATCH 0/3] usb: dwc3: ACPI support Heikki Krogerus
2014-09-24  8:00 ` [resend PATCH 1/3] ACPI / platform: provide default DMA mask Heikki Krogerus
2014-09-24 13:49   ` Rafael J. Wysocki
2014-10-21 12:27     ` Adrian Hunter
2014-10-21 13:08       ` Rafael J. Wysocki
2014-10-21 13:13         ` Adrian Hunter
2014-10-22  7:33           ` Adrian Hunter
2014-10-22 14:19             ` Rafael J. Wysocki
2014-10-23 15:06               ` Felipe Balbi
2014-10-23 15:06                 ` Felipe Balbi
2014-10-23 21:29                 ` Rafael J. Wysocki
2014-09-24  8:00 ` Heikki Krogerus [this message]
2014-09-24  8:00 ` [resend PATCH 3/3] usb: dwc3: add ACPI support Heikki Krogerus
2014-09-24 14:50   ` Felipe Balbi
2014-09-24 14:50     ` Felipe Balbi
2014-09-25  7:57     ` [PATCHv2 " Heikki Krogerus

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=1411545639-18741-3-git-send-email-heikki.krogerus@linux.intel.com \
    --to=heikki.krogerus@linux.intel.com \
    --cc=balbi@ti.com \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=rjw@rjwysocki.net \
    /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.