projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into for-next
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
char
/
ppdev.c
diff --git
a/drivers/char/ppdev.c
b/drivers/char/ppdev.c
index d0d824ebf2c187d492f29daef8bbf1043f56d7f1..1cd49241e60eb5024ac2941a5b0787fa46f7c13e 100644
(file)
--- a/
drivers/char/ppdev.c
+++ b/
drivers/char/ppdev.c
@@
-251,12
+251,8
@@
static ssize_t pp_write (struct file * file, const char __user * buf,
break;
}
break;
}
- if (signal_pending (current)) {
- if (!bytes_written) {
- bytes_written = -EINTR;
- }
+ if (signal_pending (current))
break;
break;
- }
cond_resched();
}
cond_resched();
}