diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-23 12:54:20 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-23 12:54:20 +0900 |
| commit | b1386cedda177b10fac009ca8d3681034f15b5b3 (patch) | |
| tree | e979766970249b4cf3b1bae41a91ee7430041bd8 /drivers | |
| parent | d15ae814ccb0df179e93d64c4642e7f58ee8398b (diff) | |
| parent | 368301f2fe4b07e5fb71dba3cc566bc59eb6705f (diff) | |
Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton:
"Five fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
pps: do not crash when failed to register
tools/vm/slabinfo: fix an unintentional printf
testing/radix-tree: fix a macro expansion bug
radix-tree: fix radix_tree_iter_retry() for tagged iterators.
mm: memcontrol: fix cgroup creation failure after many small jobs
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pps/clients/pps_parport.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pps/clients/pps_parport.c b/drivers/pps/clients/pps_parport.c index 38a8bbe74810..83797d89c30f 100644 --- a/drivers/pps/clients/pps_parport.c +++ b/drivers/pps/clients/pps_parport.c @@ -195,7 +195,7 @@ static void parport_detach(struct parport *port) struct pps_client_pp *device; /* FIXME: oooh, this is ugly! */ - if (strcmp(pardev->name, KBUILD_MODNAME)) + if (!pardev || strcmp(pardev->name, KBUILD_MODNAME)) /* not our port */ return; |