diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/phy/phy.c | 5 | ||||
| -rw-r--r-- | drivers/usb/gadget/at91_udc.c | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 6ca1bb2573..faa5c26c22 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -290,6 +290,11 @@ int phy_device_connect(struct eth_device *edev, struct mii_bus *bus, int addr, if (!IS_ERR(dev) && !dev->attached_dev) break; } + + if (IS_ERR(dev)) { + ret = PTR_ERR(dev); + goto fail; + } } if (dev->attached_dev) diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c index acd9e44df1..6eeef7d8c7 100644 --- a/drivers/usb/gadget/at91_udc.c +++ b/drivers/usb/gadget/at91_udc.c @@ -1417,7 +1417,7 @@ static struct poller_struct poller = { static int __init at91udc_probe(struct device_d *dev) { - struct at91_udc *udc; + struct at91_udc *udc = &controller; int retval; if (!dev->platform_data) { @@ -1427,7 +1427,6 @@ static int __init at91udc_probe(struct device_d *dev) } /* init software state */ - udc = &controller; udc->dev = dev; udc->board = *(struct at91_udc_data *) dev->platform_data; udc->enabled = 0; |