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

Commit 6427a765 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Greg Kroah-Hartman
Browse files

uio: Cleanup irq handling. 



Change the value of UIO_IRQ_NONE -2 to 0.  0 is well defined in the rest
of the kernel as the value to indicate an irq has not been assigned.

Update the calls to request_irq and free_irq to only ignore UIO_IRQ_NONE
and UIO_IRQ_CUSTOM allowing the rest of the kernel's possible irq
numbers to be used.

Signed-off-by: default avatarEric W. Biederman <ebiederm@aristanetworks.com>
Reviewed-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarHans J. Koch <hjk@linutronix.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 70a9156b

drivers/uio/uio.c

+7 −7
Original line number Diff line number Diff line
@@ -512,7 +512,7 @@ static unsigned int uio_poll(struct file *filep, poll_table *wait) 
	struct uio_listener *listener = filep->private_data;

	struct uio_device *idev = listener->dev;



	if (idev->info->irq == UIO_IRQ_NONE)

	if (!idev->info->irq)

		return -EIO;



	poll_wait(filep, &idev->wait, wait);
@@ -530,7 +530,7 @@ static ssize_t uio_read(struct file *filep, char __user *buf, 
	ssize_t retval;

	s32 event_count;



	if (idev->info->irq == UIO_IRQ_NONE)

	if (!idev->info->irq)

		return -EIO;



	if (count != sizeof(s32))
@@ -578,7 +578,7 @@ static ssize_t uio_write(struct file *filep, const char __user *buf, 
	ssize_t retval;

	s32 irq_on;



	if (idev->info->irq == UIO_IRQ_NONE)

	if (!idev->info->irq)

		return -EIO;



	if (count != sizeof(s32))
@@ -825,9 +825,9 @@ int __uio_register_device(struct module *owner, 


	info->uio_dev = idev;



	if (idev->info->irq >= 0) {

		ret = request_irq(idev->info->irq, uio_interrupt,

				  idev->info->irq_flags, idev->info->name, idev);

	if (info->irq && (info->irq != UIO_IRQ_CUSTOM)) {

		ret = request_irq(info->irq, uio_interrupt,

				  info->irq_flags, info->name, idev);

		if (ret)

			goto err_request_irq;

	}
@@ -863,7 +863,7 @@ void uio_unregister_device(struct uio_info *info) 


	uio_free_minor(idev);



	if (info->irq >= 0)

	if (info->irq && (info->irq != UIO_IRQ_CUSTOM))

		free_irq(info->irq, idev);



	uio_dev_del_attributes(idev);

include/linux/uio_driver.h

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ extern void uio_event_notify(struct uio_info *info); 


/* defines for uio_info->irq */

#define UIO_IRQ_CUSTOM	-1

#define UIO_IRQ_NONE	-2

#define UIO_IRQ_NONE	0



/* defines for uio_mem->memtype */

#define UIO_MEM_NONE	0