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

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

staging: comedi: change type of num_subdevices parameter to comedi_alloc_subdevices 



The n_subdevices variable of struct comedi_device is an int type.
Change the type of the comedi_alloc_subdevices 'num_subdevices' from
an unsigned int to an int to match it.

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 0c16ae76

drivers/staging/comedi/comedidev.h

+1 −1
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ static inline struct comedi_subdevice *comedi_get_write_subdevice( 
	return info->device->write_subdev;

}



int comedi_alloc_subdevices(struct comedi_device *, unsigned int);

int comedi_alloc_subdevices(struct comedi_device *, int);



void comedi_device_detach(struct comedi_device *dev);

int comedi_device_attach(struct comedi_device *dev,

drivers/staging/comedi/drivers.c

+2 −3
Original line number Diff line number Diff line
@@ -56,10 +56,9 @@ static int poll_invalid(struct comedi_device *dev, struct comedi_subdevice *s); 


struct comedi_driver *comedi_drivers;



int comedi_alloc_subdevices(struct comedi_device *dev,

			    unsigned int num_subdevices)

int comedi_alloc_subdevices(struct comedi_device *dev, int num_subdevices)

{

	unsigned i;

	int i;



	dev->n_subdevices = num_subdevices;

	dev->subdevices =