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

Commit d19db51a authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman
Browse files

staging: comedi: cancel commands before detaching device 



The comedi core module's handling of the `COMEDI_DEVCONFIG` ioctl will
not allow a device to be detached if it is busy.  However, comedi
devices can also be auto-detached due to a removal of a hardware device.
One of the things we should do in that case is cancel any asynchronous
commands that are running.  Add a new function
`comedi_device_cancel_all()` to do that and call it from
`comedi_device_detach()`.

Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8da8c86f

drivers/staging/comedi/comedi_fops.c

+15 −0
Original line number Original line Diff line number Diff line
@@ -584,6 +584,21 @@ static int do_cancel(struct comedi_device *dev, struct comedi_subdevice *s) 
	return ret;

	return ret;

}

}





void comedi_device_cancel_all(struct comedi_device *dev)

{

	struct comedi_subdevice *s;

	int i;



	if (!dev->attached)

		return;



	for (i = 0; i < dev->n_subdevices; i++) {

		s = &dev->subdevices[i];

		if (s->async)

			do_cancel(dev, s);

	}

}



static int is_device_busy(struct comedi_device *dev)

static int is_device_busy(struct comedi_device *dev)

{

{

	struct comedi_subdevice *s;

	struct comedi_subdevice *s;

drivers/staging/comedi/comedi_internal.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ int comedi_buf_alloc(struct comedi_device *dev, struct comedi_subdevice *s, 
		     unsigned long new_size);

		     unsigned long new_size);

void comedi_buf_reset(struct comedi_async *async);

void comedi_buf_reset(struct comedi_async *async);

unsigned int comedi_buf_write_n_allocated(struct comedi_async *async);

unsigned int comedi_buf_write_n_allocated(struct comedi_async *async);

void comedi_device_cancel_all(struct comedi_device *dev);





extern unsigned int comedi_default_buf_size_kb;

extern unsigned int comedi_default_buf_size_kb;

extern unsigned int comedi_default_buf_maxsize_kb;

extern unsigned int comedi_default_buf_maxsize_kb;

drivers/staging/comedi/drivers.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -133,6 +133,7 @@ static void comedi_device_detach_cleanup(struct comedi_device *dev) 




void comedi_device_detach(struct comedi_device *dev)

void comedi_device_detach(struct comedi_device *dev)

{

{

	comedi_device_cancel_all(dev);

	down_write(&dev->attach_lock);

	down_write(&dev->attach_lock);

	dev->attached = false;

	dev->attached = false;

	if (dev->driver)

	if (dev->driver)