From: Marc Kleine-Budde <mkl@pengutronix.de>
To: Alexander Stein <alexander.stein@systec-electronic.com>,
Oliver Hartkopp <socketcan@hartkopp.net>
Cc: Thomas Gleixner <tglx@linutronix.de>,
Wolfgang Grandegger <wg@grandegger.com>,
"linux-can@vger.kernel.org" <linux-can@vger.kernel.org>
Subject: Re: [PATCH v2] c_can: Add support for eg20t (pch_can)
Date: Thu, 17 Apr 2014 22:23:07 +0200 [thread overview]
Message-ID: <5350382B.6050803@pengutronix.de> (raw)
In-Reply-To: <1396853523-14941-1-git-send-email-alexander.stein@systec-electronic.com>
[-- Attachment #1: Type: text/plain, Size: 1299 bytes --]
On 04/07/2014 08:52 AM, Alexander Stein wrote:
> Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com>
Applied to can-next/master
> ---
> This is the correct version of this patch I use.
> It has no spinlock which is not needed, AFAICT.
>
> drivers/net/can/c_can/c_can_pci.c | 50 ++++++++++++++++++++++++++++++++++++++-
> 1 file changed, 49 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/can/c_can/c_can_pci.c b/drivers/net/can/c_can/c_can_pci.c
> index bce0be5..128788c 100644
> --- a/drivers/net/can/c_can/c_can_pci.c
> +++ b/drivers/net/can/c_can/c_can_pci.c
[...]
> @@ -87,7 +118,7 @@ static int c_can_pci_probe(struct pci_dev *pdev,
> pci_set_master(pdev);
> pci_enable_msi(pdev);
>
> - addr = pci_iomap(pdev, 0, pci_resource_len(pdev, 0));
> + addr = pci_iomap(pdev, c_can_pci_data->bar, pci_resource_len(pdev, 0));
addr = pci_iomap(pdev, c_can_pci_data->bar,
pci_resource_len(pdev, c_can_pci_data->bar));
With this fix applied.
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 242 bytes --]
next prev parent reply other threads:[~2014-04-17 20:23 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <"<533DB663.3030408@hartkopp.net>
2014-04-07 6:52 ` [PATCH v2] c_can: Add support for eg20t (pch_can) Alexander Stein
2014-04-08 14:20 ` Thomas Gleixner
2014-04-08 14:26 ` Wolfgang Grandegger
2014-04-08 14:33 ` Thomas Gleixner
2014-04-17 20:23 ` Marc Kleine-Budde [this message]
2014-04-17 20:47 ` Marc Kleine-Budde
2014-04-17 21:18 ` Thomas Gleixner
2014-04-17 21:27 ` Marc Kleine-Budde
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=5350382B.6050803@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=alexander.stein@systec-electronic.com \
--cc=linux-can@vger.kernel.org \
--cc=socketcan@hartkopp.net \
--cc=tglx@linutronix.de \
--cc=wg@grandegger.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).