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

Commit 2cd556ae authored by Stefan Richter's avatar Stefan Richter
Browse files

ieee1394: eth1394: clean up host removal 



ether1394_add_host() guarantees that hi->dev != NULL if hi != NULL.

Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
parent 157188cb

drivers/ieee1394/eth1394.c

+10 −17
Original line number Diff line number Diff line
@@ -655,25 +655,18 @@ static void ether1394_add_host (struct hpsb_host *host) 
static void ether1394_remove_host (struct hpsb_host *host)

{

	struct eth1394_host_info *hi;

	struct eth1394_priv *priv;



	hi = hpsb_get_hostinfo(&eth1394_highlevel, host);

	if (hi != NULL) {

		struct eth1394_priv *priv = netdev_priv(hi->dev);



		hpsb_unregister_addrspace(&eth1394_highlevel, host,

					  priv->local_fifo);



		if (priv->iso != NULL)

	if (!hi)

		return;

	priv = netdev_priv(hi->dev);

	hpsb_unregister_addrspace(&eth1394_highlevel, host, priv->local_fifo);

	if (priv->iso)

		hpsb_iso_shutdown(priv->iso);



		if (hi->dev) {

	unregister_netdev(hi->dev);

	free_netdev(hi->dev);

}

	}



	return;

}



/* A reset has just arisen */

static void ether1394_host_reset (struct hpsb_host *host)
@@ -689,7 +682,7 @@ static void ether1394_host_reset (struct hpsb_host *host) 
	hi = hpsb_get_hostinfo(&eth1394_highlevel, host);



	/* This can happen for hosts that we don't use */

	if (hi == NULL)

	if (!hi)

		return;



	dev = hi->dev;