| Message ID | 201007201730.42852.jdelvare@suse.de |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | David Miller |
| Headers | show |
On Tue, Jul 20, 2010 at 08:30, Jean Delvare <jdelvare@suse.de> wrote: > err is set again a few lines below. > > Signed-off-by: Jean Delvare <jdelvare@suse.de> > Cc: Auke Kok <auke-jan.h.kok@intel.com> > Cc: Bruce Allan <bruce.w.allan@intel.com> > Cc: Jesse Brandeburg <jesse.brandeburg@intel.com> > --- > I sent this patch to the e1000-devel list on June 8th, 2010, but > didn't receive any answer: > http://sourceforge.net/mailarchive/forum.php?thread_name=201006081820.25381.jdelvare%40suse.de&forum_name=e1000-devel > > drivers/net/e1000e/netdev.c | 2 -- > 1 file changed, 2 deletions(-) > > --- a/drivers/net/e1000e/netdev.c > +++ b/drivers/net/e1000e/netdev.c > @@ -5557,8 +5557,6 @@ static int __devinit e1000_probe(struct > if (err) > goto err_sw_init; > > - err = -EIO; > - > memcpy(&hw->mac.ops, ei->mac_ops, sizeof(hw->mac.ops)); > memcpy(&hw->nvm.ops, ei->nvm_ops, sizeof(hw->nvm.ops)); > memcpy(&hw->phy.ops, ei->phy_ops, sizeof(hw->phy.ops)); > > -- > Jean Delvare > Suse L3 Thanks Jean, sorry for the delayed response. I have added the patch to my queue.
--- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c @@ -5557,8 +5557,6 @@ static int __devinit e1000_probe(struct if (err) goto err_sw_init; - err = -EIO; - memcpy(&hw->mac.ops, ei->mac_ops, sizeof(hw->mac.ops)); memcpy(&hw->nvm.ops, ei->nvm_ops, sizeof(hw->nvm.ops)); memcpy(&hw->phy.ops, ei->phy_ops, sizeof(hw->phy.ops));
err is set again a few lines below. Signed-off-by: Jean Delvare <jdelvare@suse.de> Cc: Auke Kok <auke-jan.h.kok@intel.com> Cc: Bruce Allan <bruce.w.allan@intel.com> Cc: Jesse Brandeburg <jesse.brandeburg@intel.com> --- I sent this patch to the e1000-devel list on June 8th, 2010, but didn't receive any answer: http://sourceforge.net/mailarchive/forum.php?thread_name=201006081820.25381.jdelvare%40suse.de&forum_name=e1000-devel drivers/net/e1000e/netdev.c | 2 -- 1 file changed, 2 deletions(-)