Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bcf77d5b authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'renesas-dma-channel' 



Sergei Shtylyov says:

====================
Fix DMA channel misreporting for the Renesas Ethernet drivers

Here's a set of 2 patches against DaveM's 'net.git' repo fixing up the DMA
channel reporting by 'ifconfig'...
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents eab81466 3c78658e

drivers/net/ethernet/renesas/ravb_main.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -1908,7 +1908,6 @@ static int ravb_probe(struct platform_device *pdev) 




	/* The Ether-specific entries in the device structure. */

	/* The Ether-specific entries in the device structure. */

	ndev->base_addr = res->start;

	ndev->base_addr = res->start;

	ndev->dma = -1;





	chip_id = (enum ravb_chip_id)of_device_get_match_data(&pdev->dev);

	chip_id = (enum ravb_chip_id)of_device_get_match_data(&pdev->dev);

drivers/net/ethernet/renesas/sh_eth.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -2996,7 +2996,6 @@ static int sh_eth_drv_probe(struct platform_device *pdev) 
	if (devno < 0)

	if (devno < 0)

		devno = 0;

		devno = 0;





	ndev->dma = -1;

	ret = platform_get_irq(pdev, 0);

	ret = platform_get_irq(pdev, 0);

	if (ret < 0)

	if (ret < 0)

		goto out_release;

		goto out_release;