| Message ID | 1457964435-2945038-3-git-send-email-arnd@arndb.de |
|---|---|
| State | Accepted |
| Commit | 916848ca6f10e1bbf0c2af72ef51e494aaa5c466 |
| Headers | show |
| Series | [1/3] net: mediatek: use dma_addr_t correctly | expand |
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c index 87f417712da0..1e6c5498bba9 100644 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c @@ -1676,7 +1676,9 @@ static int mtk_probe(struct platform_device *pdev) struct mtk_eth *eth; int err; - device_reset(&pdev->dev); + err = device_reset(&pdev->dev); + if (err) + return err; match = of_match_device(of_mtk_match, &pdev->dev); soc = (struct mtk_soc_data *)match->data;
The device_reset() function may fail, so we have to check its return value, e.g. to make deferred probing work correctly. gcc warns about it because of the warn_unused_result attribute: drivers/net/ethernet/mediatek/mtk_eth_soc.c: In function 'mtk_probe': drivers/net/ethernet/mediatek/mtk_eth_soc.c:1679:2: error: ignoring return value of 'device_reset', declared with attribute warn_unused_result [-Werror=unused-result] This adds the trivial error check to propagate the return value to the generic platform device probe code. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.7.0