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

Commit 33cfce64 authored Aug 21, 2014 by Malcolm Priestley Committed by Greg Kroah-Hartman Aug 30, 2014

staging: vt6655: remove multiple instances of netdevice.



netdevice can only be created once.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 70afb8e5

drivers/staging/vt6655/device.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -339,7 +339,6 @@ struct vnt_private {

		// netdev
		struct net_device *dev;
		struct net_device *next_module;
		struct net_device_stats stats;

		//dma addr, rx/tx pool

drivers/staging/vt6655/device_main.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -247,7 +247,6 @@ DEVICE_PARAM(bDiversityANTEnable, "ANT diversity mode");
		//

		static int device_nics = 0;
		static struct net_device *root_device_dev = NULL;

		static CHIP_INFO chip_info_table[] = {
		{ VT3253, "VIA Networking Solomon-A/B/G Wireless LAN Adapter ",
		@@ -851,8 +850,6 @@ vt6655_probe(struct pci_dev pcid, const struct pci_device_id ent)

		vt6655_init_info(pcid, &pDevice, pChip_info);
		pDevice->dev = dev;
		pDevice->next_module = root_device_dev;
		root_device_dev = dev;

		if (pci_enable_device(pcid)) {
		device_free_info(pDevice);