diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-06-10 23:35:25 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-06-10 23:35:25 -0400 |
| commit | db723733e5b612dcb7e8c4e31382affdb4635e7a (patch) | |
| tree | 583437d0629d50240e42fb7f225b7118a13e41ac | |
| parent | 5505ce43e6acf9e5c6742085b77e1c2f1fc866d5 (diff) | |
| download | longterm-queue-4.8-db723733e5b612dcb7e8c4e31382affdb4635e7a.tar.gz | |
char: trivial context refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/ppdev-check-before-attaching-port.patch | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/queue/ppdev-check-before-attaching-port.patch b/queue/ppdev-check-before-attaching-port.patch index 7705034..338353a 100644 --- a/queue/ppdev-check-before-attaching-port.patch +++ b/queue/ppdev-check-before-attaching-port.patch @@ -1,4 +1,4 @@ -From dd5c472a60e43549d789a17a8444513eec64bd7e Mon Sep 17 00:00:00 2001 +From 6a3f3d95bd53c0e2688e42fe8c71bfa63d56b69d Mon Sep 17 00:00:00 2001 From: Sudip Mukherjee <sudipm.mukherjee@gmail.com> Date: Sat, 12 Nov 2016 21:22:12 +0000 Subject: [PATCH] ppdev: check before attaching port @@ -17,9 +17,10 @@ we have already attached. Tested-by: Joe Lawrence <joe.lawrence@redhat.com> Signed-off-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c -index 85c63e49df7f..02819e0703c8 100644 +index f8a483c67b07..04f3e3aa73b0 100644 --- a/drivers/char/ppdev.c +++ b/drivers/char/ppdev.c @@ -86,6 +86,9 @@ struct pp_struct { @@ -32,7 +33,7 @@ index 85c63e49df7f..02819e0703c8 100644 /* pp_struct.flags bitfields */ #define PP_CLAIMED (1<<0) #define PP_EXCL (1<<1) -@@ -789,13 +792,29 @@ static const struct file_operations pp_fops = { +@@ -790,13 +793,29 @@ static const struct file_operations pp_fops = { static void pp_attach(struct parport *port) { @@ -63,7 +64,7 @@ index 85c63e49df7f..02819e0703c8 100644 + devices[port->number] = NULL; } - static int pp_probe(struct pardevice *par_dev) + static struct parport_driver pp_driver = { -- 2.12.0 |