staging: ft1000: Use specific error return code for reg_ft1000_netdev(). (aaf0885c) · Commits · 戴 / test

drivers/staging/ft1000/ft1000-usb/ft1000_hw.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -1103,7 +1103,7 @@ err_net:
		// Notes:
		//
		//---------------------------------------------------------------------------
		u16 reg_ft1000_netdev(struct ft1000_device ft1000dev, struct usb_interface intf)
		int reg_ft1000_netdev(struct ft1000_device ft1000dev, struct usb_interface intf)
		{
		struct net_device *netdev;
		FT1000_INFO *pInfo;
		@@ -1124,7 +1124,7 @@ u16 reg_ft1000_netdev(struct ft1000_device ft1000dev, struct usb_interface int
		{
		DEBUG("reg_ft1000_netdev: could not register network device\n");
		free_netdev(netdev);
		return STATUS_FAILURE;
		return rc;
		}


		@@ -1149,7 +1149,7 @@ u16 reg_ft1000_netdev(struct ft1000_device ft1000dev, struct usb_interface int
		pInfo->CardReady = 1;


		return STATUS_SUCCESS;
		return 0;
		}

		static int ft1000_reset(struct net_device *dev)

+3 −1

Original line number	Diff line number	Diff line
		@@ -191,7 +191,9 @@ static int ft1000_probe(struct usb_interface *interface,

		DEBUG("ft1000_probe::Card Ready!!!! Registering network device\n");

		reg_ft1000_netdev(ft1000dev, interface);
		ret = reg_ft1000_netdev(ft1000dev, interface);
		if (ret)
		goto err_load;

		pft1000info->NetDevRegDone = 1;

+1 −1

Original line number	Diff line number	Diff line
		@@ -597,7 +597,7 @@ char getfw (char fn, size_t *pimgsz);
		int dsp_reload(struct ft1000_device *ft1000dev);
		u16 init_ft1000_netdev(struct ft1000_device *ft1000dev);
		struct usb_interface;
		u16 reg_ft1000_netdev(struct ft1000_device ft1000dev, struct usb_interface intf);
		int reg_ft1000_netdev(struct ft1000_device ft1000dev, struct usb_interface intf);
		int ft1000_poll(void* dev_id);

		void ft1000InitProc(struct net_device *dev);