Commit 628ccfc8 authored by Yang Yingliang's avatar Yang Yingliang Committed by Max Filippov
Browse files

xtensa: iss: fix handling error cases in iss_net_configure() 



The 'pdev' and 'netdev' need to be released in error cases of
iss_net_configure().

Change the return type of iss_net_configure() to void, because it's
not used.

Fixes: 7282bee7 ("[PATCH] xtensa: Architecture support for Tensilica Xtensa Part 8")
Reported-by: default avatarHulk Robot <hulkci@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
parent 8864fb83

arch/xtensa/platforms/iss/network.c

+15 −17
Original line number Original line Diff line number Diff line
@@ -475,16 +475,15 @@ static void iss_net_pdev_release(struct device *dev) 
	free_netdev(lp->dev);

	free_netdev(lp->dev);

}

}





static int iss_net_configure(int index, char *init)

static void iss_net_configure(int index, char *init)

{

{

	struct net_device *dev;

	struct net_device *dev;

	struct iss_net_private *lp;

	struct iss_net_private *lp;

	int err;





	dev = alloc_etherdev(sizeof(*lp));

	dev = alloc_etherdev(sizeof(*lp));

	if (dev == NULL) {

	if (dev == NULL) {

		pr_err("eth_configure: failed to allocate device\n");

		pr_err("eth_configure: failed to allocate device\n");

		return 1;

		return;

	}

	}





	/* Initialize private element. */

	/* Initialize private element. */
@@ -511,7 +510,7 @@ static int iss_net_configure(int index, char *init) 
	if (!tuntap_probe(lp, index, init)) {

	if (!tuntap_probe(lp, index, init)) {

		pr_err("%s: invalid arguments. Skipping device!\n",

		pr_err("%s: invalid arguments. Skipping device!\n",

		       dev->name);

		       dev->name);

		goto errout;

		goto err_free_netdev;

	}

	}





	pr_info("Netdevice %d (%pM)\n", index, dev->dev_addr);

	pr_info("Netdevice %d (%pM)\n", index, dev->dev_addr);
@@ -519,14 +518,16 @@ static int iss_net_configure(int index, char *init) 
	/* sysfs register */

	/* sysfs register */





	if (!driver_registered) {

	if (!driver_registered) {

		platform_driver_register(&iss_net_driver);

		if (platform_driver_register(&iss_net_driver))

			goto err_free_netdev;

		driver_registered = 1;

		driver_registered = 1;

	}

	}





	lp->pdev.id = index;

	lp->pdev.id = index;

	lp->pdev.name = DRIVER_NAME;

	lp->pdev.name = DRIVER_NAME;

	lp->pdev.dev.release = iss_net_pdev_release;

	lp->pdev.dev.release = iss_net_pdev_release;

	platform_device_register(&lp->pdev);

	if (platform_device_register(&lp->pdev))

		goto err_free_netdev;

	SET_NETDEV_DEV(dev, &lp->pdev.dev);

	SET_NETDEV_DEV(dev, &lp->pdev.dev);





	dev->netdev_ops = &iss_netdev_ops;

	dev->netdev_ops = &iss_netdev_ops;
@@ -535,23 +536,20 @@ static int iss_net_configure(int index, char *init) 
	dev->irq = -1;

	dev->irq = -1;





	rtnl_lock();

	rtnl_lock();

	err = register_netdevice(dev);

	if (register_netdevice(dev)) {

		rtnl_unlock();

		rtnl_unlock();



	if (err) {

		pr_err("%s: error registering net device!\n", dev->name);

		pr_err("%s: error registering net device!\n", dev->name);

		/* XXX: should we call ->remove() here? */

		platform_device_unregister(&lp->pdev);

		free_netdev(dev);

		return;

		return 1;

	}

	}

	rtnl_unlock();





	timer_setup(&lp->tl, iss_net_user_timer_expire, 0);

	timer_setup(&lp->tl, iss_net_user_timer_expire, 0);





	return 0;

	return;





errout:

err_free_netdev:

	/* FIXME: unregister; free, etc.. */

	free_netdev(dev);

	return -EIO;

}

}





/* ------------------------------------------------------------------------- */

/* ------------------------------------------------------------------------- */