mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Robert Jarzmik <robert.jarzmik@free.fr>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH 1/2] net: smc1111: fix platform data initializations
Date: Mon, 13 Apr 2015 09:21:12 +0200	[thread overview]
Message-ID: <20150413072112.GB9742@pengutronix.de> (raw)
In-Reply-To: <1428788562-10004-1-git-send-email-robert.jarzmik@free.fr>

On Sat, Apr 11, 2015 at 11:42:41PM +0200, Robert Jarzmik wrote:
> The configuration and control setup introduced in commit "extend the
> driver for 91c94 and 91c96 support" suffers from a typo defect, which
> makes the commit broken.
> 
> The typo happens to be in barebox tree, while it's not in the tested
> patches I had, and there was a mismatch in my former submission, which
> is fixed by this patch.
> 
> Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
> ---
>  drivers/net/smc91111.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/net/smc91111.c b/drivers/net/smc91111.c
> index 698c74a..bcb470c 100644
> --- a/drivers/net/smc91111.c
> +++ b/drivers/net/smc91111.c
> @@ -1437,6 +1437,8 @@ static int smc91c111_probe(struct device_d *dev)
>  			priv->a = access_via_16bit;
>  		pdata->config_setup = pdata->config_setup;
>  		pdata->control_setup = pdata->control_setup;
> +		priv->config_setup = pdata->config_setup;
> +		priv->control_setup = pdata->control_setup;

This should be:

 		if (pdata->bus_width == 16)
 			priv->a = access_via_16bit;
-		pdata->config_setup = pdata->config_setup;
-		pdata->control_setup = pdata->control_setup;
+		priv->config_setup = pdata->config_setup;
+		priv->control_setup = pdata->control_setup;
 	}

Fixed this while applying because this is master material and I want to
make a release today.

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2015-04-13  7:21 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-11 21:42 Robert Jarzmik
2015-04-11 21:42 ` [PATCH 2/2] net: smc1111: add a quirk for pxa pxa27x platforms Robert Jarzmik
2015-04-13  7:21 ` Sascha Hauer [this message]
2015-04-13 17:53   ` [PATCH 1/2] net: smc1111: fix platform data initializations Robert Jarzmik

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=20150413072112.GB9742@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=robert.jarzmik@free.fr \
    /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