diff --git a/[refs] b/[refs] index 3bb334fc28b3..d59c0961274c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d6a8c36dd6f6f06f046e5c61d3fb39b777c3bdc6 +refs/heads/master: 43d6869037d6fa8f92a7a7e6df3b48147c8a3ef9 diff --git a/trunk/drivers/net/ethernet/s6gmac.c b/trunk/drivers/net/ethernet/s6gmac.c index cd5f4e21cede..b6739afeaca1 100644 --- a/trunk/drivers/net/ethernet/s6gmac.c +++ b/trunk/drivers/net/ethernet/s6gmac.c @@ -998,6 +998,7 @@ static int s6gmac_probe(struct platform_device *pdev) mb = mdiobus_alloc(); if (!mb) { printk(KERN_ERR DRV_PRMT "error allocating mii bus\n"); + res = -ENOMEM; goto errmii; } mb->name = "s6gmac_mii";