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

Commit de4772ae authored by Sudip Mukherjee's avatar Sudip Mukherjee Committed by Greg Kroah-Hartman
Browse files

staging: slicoss: use status in slic_if_init 



While initializing the interface if we are not able to setup the command
to UP the link then we release everything and return the error code.

Signed-off-by: default avatarSudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 78affe65

drivers/staging/slicoss/slicoss.c

+16 −1
Original line number Diff line number Diff line
@@ -2379,7 +2379,22 @@ static int slic_if_init(struct adapter *adapter, unsigned long *flags) 
	slic_reg32_write(&slic_regs->slic_icr, ICR_INT_ON, FLUSH);



	slic_link_config(adapter, LINK_AUTOSPEED, LINK_AUTOD);

	slic_link_event_handler(adapter);

	rc = slic_link_event_handler(adapter);

	if (rc) {

		/* disable interrupts then clear pending events */

		slic_reg32_write(&slic_regs->slic_icr, ICR_INT_OFF, FLUSH);

		slic_reg32_write(&slic_regs->slic_isr, 0, FLUSH);

		if (adapter->pingtimerset) {

			del_timer(&adapter->pingtimer);

			adapter->pingtimerset = 0;

		}

		if (card->loadtimerset) {

			del_timer(&card->loadtimer);

			card->loadtimerset = 0;

		}

		adapter->state = ADAPT_DOWN;

		slic_adapter_freeresources(adapter);

	}



err:

	return rc;