From 19a511437955dfd52c9f887292f3dd0896e4a514 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 12 Jun 2012 11:57:27 -0700 Subject: [PATCH] --- yaml --- r: 317303 b: refs/heads/master c: 8b9ba6e5efc3213f384cda155861a4f7ae903365 h: refs/heads/master i: 317301: b03152c100f4b596a808be802d9a2f7d7f421e09 317299: 821be74bce85036218cdc17ea174aa8484be6f5d 317295: cd494bad146c89f1552c07354de0845e9f5f9d09 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/comedidev.h | 2 +- trunk/drivers/staging/comedi/drivers.c | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 567f69039749..8f23b342fc87 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0c16ae762990660c4dfd7515e3d46b4249f535f0 +refs/heads/master: 8b9ba6e5efc3213f384cda155861a4f7ae903365 diff --git a/trunk/drivers/staging/comedi/comedidev.h b/trunk/drivers/staging/comedi/comedidev.h index bb98f82141a1..e0f3915b0f63 100644 --- a/trunk/drivers/staging/comedi/comedidev.h +++ b/trunk/drivers/staging/comedi/comedidev.h @@ -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, diff --git a/trunk/drivers/staging/comedi/drivers.c b/trunk/drivers/staging/comedi/drivers.c index 541364782b5f..979aa0e88997 100644 --- a/trunk/drivers/staging/comedi/drivers.c +++ b/trunk/drivers/staging/comedi/drivers.c @@ -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 =