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

Commit 9fb81ce6 authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files

[PATCH] USB: net2280: set driver data before it is used 



This patch (as671) fixes a bug in the error pathway for the net2280
probe routine.  A failure during probe will cause the driver to call
pci_get_drvdata before the corresponding pci_set_drvdata has been set.
The patch also does a kzalloc conversion.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 658ad5e0

drivers/usb/gadget/net2280.c

+2 −3
Original line number Diff line number Diff line
@@ -2833,13 +2833,13 @@ static int net2280_probe (struct pci_dev *pdev, const struct pci_device_id *id) 
	}



	/* alloc, and start init */

	dev = kmalloc (sizeof *dev, SLAB_KERNEL);

	dev = kzalloc (sizeof *dev, SLAB_KERNEL);

	if (dev == NULL){

		retval = -ENOMEM;

		goto done;

	}



	memset (dev, 0, sizeof *dev);

	pci_set_drvdata (pdev, dev);

	spin_lock_init (&dev->lock);

	dev->pdev = pdev;

	dev->gadget.ops = &net2280_ops;
@@ -2952,7 +2952,6 @@ static int net2280_probe (struct pci_dev *pdev, const struct pci_device_id *id) 
	dev->chiprev = get_idx_reg (dev->regs, REG_CHIPREV) & 0xffff;



	/* done */

	pci_set_drvdata (pdev, dev);

	INFO (dev, "%s\n", driver_desc);

	INFO (dev, "irq %s, pci mem %p, chip rev %04x\n",

			bufp, base, dev->chiprev);