[PATCH] 2.5.3-pre6: getmodes

This patch prevents ppdev from oopsing when the PPGETMODES ioctl is
used before a PPCLAIM.

	* drivers/char/ppdev.c: Fix an oops in PPGETMODES handling.

diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c
index bdebe0aee56387838083aa3be8e483e66d025795..dcc2d559ad1cb5cc55b0d4fe3d70c6bef6aecf7b 100644 (file)
--- a/drivers/char/ppdev.c
+++ b/drivers/char/ppdev.c
@@ -429,8 +429,12 @@ static int pp_ioctl(struct inode *inode, struct file *file,
            {
                unsigned int modes;
 
-               modes = pp->pdev->port->modes;
-               if (copy_to_user ((unsigned int *)arg, &modes, sizeof (port->modes))) {
+               port = parport_find_number (minor);
+               if (!port)
+                       return -ENODEV;
+
+               modes = port->modes;
+               if (copy_to_user ((unsigned int *)arg, &modes, sizeof (modes))) {
                        return -EFAULT;
                }
                return 0;