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

Commit fba1d0fa authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: only set dev->n_subdevices when kcalloc succeedes 



It's possible for the kcalloc in comedi_alloc_subdevices to fail.
Only set the dev->n_subdevices variable if the allocation is
successful.

Since the core sets dev->n_subdevices, remove all the places in the
drivers where this variable was getting set.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbott@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7f801c41

drivers/staging/comedi/drivers.c

+1 −1
Original line number Diff line number Diff line
@@ -62,12 +62,12 @@ int comedi_alloc_subdevices(struct comedi_device *dev, int num_subdevices) 


	if (num_subdevices < 1)

		return -EINVAL;

	dev->n_subdevices = num_subdevices;

	dev->subdevices =

	    kcalloc(num_subdevices, sizeof(struct comedi_subdevice),

		    GFP_KERNEL);

	if (!dev->subdevices)

		return -ENOMEM;

	dev->n_subdevices = num_subdevices;

	for (i = 0; i < num_subdevices; ++i) {

		dev->subdevices[i].device = dev;

		dev->subdevices[i].async_dma_dir = DMA_NONE;

drivers/staging/comedi/drivers/comedi_test.c

+1 −2
Original line number Diff line number Diff line
@@ -447,8 +447,7 @@ static int waveform_attach(struct comedi_device *dev, 
	devpriv->uvolt_amplitude = amplitude;

	devpriv->usec_period = period;



	dev->n_subdevices = 2;

	if (comedi_alloc_subdevices(dev, dev->n_subdevices) < 0)

	if (comedi_alloc_subdevices(dev, 2) < 0)

		return -ENOMEM;



	s = dev->subdevices + 0;

drivers/staging/comedi/drivers/ni_660x.c

+1 −3
Original line number Diff line number Diff line
@@ -1093,9 +1093,7 @@ static int ni_660x_attach(struct comedi_device *dev, 


	printk(KERN_INFO " %s ", dev->board_name);



	dev->n_subdevices = 2 + NI_660X_MAX_NUM_COUNTERS;



	if (comedi_alloc_subdevices(dev, dev->n_subdevices) < 0)

	if (comedi_alloc_subdevices(dev, 2 + NI_660X_MAX_NUM_COUNTERS) < 0)

		return -ENOMEM;



	s = dev->subdevices + 0;

drivers/staging/comedi/drivers/s526.c

+1 −2
Original line number Diff line number Diff line
@@ -778,8 +778,7 @@ static int s526_attach(struct comedi_device *dev, struct comedi_devconfig *it) 
 * Allocate the subdevice structures.  alloc_subdevice() is a

 * convenient macro defined in comedidev.h.

 */

	dev->n_subdevices = 4;

	if (comedi_alloc_subdevices(dev, dev->n_subdevices) < 0)

	if (comedi_alloc_subdevices(dev, 4) < 0)

		return -ENOMEM;



	s = dev->subdevices + 0;

drivers/staging/comedi/drivers/usbdux.c

+4 −3
Original line number Diff line number Diff line
@@ -2624,6 +2624,7 @@ static int usbdux_attach_common(struct comedi_device *dev, 
{

	int ret;

	struct comedi_subdevice *s = NULL;

	int n_subdevs;



	down(&udev->sem);

	/* pointer back to the corresponding comedi device */
@@ -2638,14 +2639,14 @@ static int usbdux_attach_common(struct comedi_device *dev, 
	/* set number of subdevices */

	if (udev->high_speed) {

		/* with pwm */

		dev->n_subdevices = 5;

		n_subdevs = 5;

	} else {

		/* without pwm */

		dev->n_subdevices = 4;

		n_subdevs = 4;

	}



	/* allocate space for the subdevices */

	ret = comedi_alloc_subdevices(dev, dev->n_subdevices);

	ret = comedi_alloc_subdevices(dev, n_subdevs);

	if (ret < 0) {

		dev_err(&udev->interface->dev,

			"comedi%d: error alloc space for subdev\n", dev->minor);