aboutsummaryrefslogtreecommitdiff
path: root/drivers/char/ppdev.c
diff options
context:
space:
mode:
authorSudip Mukherjee <sudipm.mukherjee@gmail.com>2016-02-12 18:33:41 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-02-14 17:43:50 -0800
commit27f3b8a3bf1442f8b571dffcb1cdf20d72c364ad (patch)
tree5bdf8a45df03844ca443c6468f8d51381948b58a /drivers/char/ppdev.c
parentd85c1a2d1591e0eb04d0c77b61e1062af61a9156 (diff)
downloadleg-kernel-27f3b8a3bf1442f8b571dffcb1cdf20d72c364ad.tar.gz
ppdev: add missing blank line
kernel coding style recommends a blank line after varaiable declaration. Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/char/ppdev.c')
-rw-r--r--drivers/char/ppdev.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c
index 8a168c4d094c..c551c0c88d8e 100644
--- a/drivers/char/ppdev.c
+++ b/drivers/char/ppdev.c
@@ -109,6 +109,7 @@ static DEFINE_MUTEX(pp_do_mutex);
static inline void pp_enable_irq(struct pp_struct *pp)
{
struct parport *port = pp->pdev->port;
+
port->ops->enable_irq(port);
}
@@ -368,6 +369,7 @@ static int pp_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
/* Deferred device registration. */
if (!pp->pdev) {
int err = register_device(minor, pp);
+
if (err) {
return err;
}
@@ -412,6 +414,7 @@ static int pp_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
case PPSETMODE:
{
int mode;
+
if (copy_from_user(&mode, argp, sizeof(mode)))
return -EFAULT;
/* FIXME: validate mode */
@@ -442,6 +445,7 @@ static int pp_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
case PPSETPHASE:
{
int phase;
+
if (copy_from_user(&phase, argp, sizeof(phase))) {
return -EFAULT;
}
@@ -665,6 +669,7 @@ static int pp_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
static long pp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
long ret;
+
mutex_lock(&pp_do_mutex);
ret = pp_do_ioctl(file, cmd, arg);
mutex_unlock(&pp_do_mutex);
@@ -755,6 +760,7 @@ static int pp_release(struct inode *inode, struct file *file)
if (pp->pdev) {
const char *name = pp->pdev->name;
+
parport_unregister_device(pp->pdev);
kfree(name);
pp->pdev = NULL;