mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH] net/e1000: fix driver probing in the presence of two e1000 devices
Date: Wed, 17 Jan 2018 09:03:01 +0100	[thread overview]
Message-ID: <20180117080301.3hjfa34nizla4sxs@pengutronix.de> (raw)
In-Reply-To: <20180111090326.32724-1-u.kleine-koenig@pengutronix.de>

On Thu, Jan 11, 2018 at 10:03:26AM +0100, Uwe Kleine-König wrote:
> The .id member of the struct device for the invm device is not
> initialized and so implicitly zero. This yields:
> 
> 	register_device: already registered invm0
> 
> for the second i210 during probe.
> 
> So use the parent's id to initialize the id for invm, too, as is already
> done for the corresponding e1000-nor device.
> 
> Fixes: a74b97f009c6 ("e1000: Expose i210's iNVM as a cdev")
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Applied, thanks

Sascha

> ---
>  drivers/net/e1000/eeprom.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/net/e1000/eeprom.c b/drivers/net/e1000/eeprom.c
> index 23fb05ec72bc..748d8afe7922 100644
> --- a/drivers/net/e1000/eeprom.c
> +++ b/drivers/net/e1000/eeprom.c
> @@ -1504,6 +1504,7 @@ int e1000_register_invm(struct e1000_hw *hw)
>  		return ret;
>  
>  	strcpy(hw->invm.dev.name, "invm");
> +	hw->invm.dev.id = hw->dev->id;
>  	hw->invm.dev.parent = hw->dev;
>  	ret = register_device(&hw->invm.dev);
>  	if (ret < 0) {
> -- 
> 2.11.0
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox

-- 
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

      reply	other threads:[~2018-01-17  8:03 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-11  9:03 Uwe Kleine-König
2018-01-17  8:03 ` Sascha Hauer [this message]

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=20180117080301.3hjfa34nizla4sxs@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=u.kleine-koenig@pengutronix.de \
    /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