summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-04-23 15:12:10 +0300
committerIngo Molnar <mingo@kernel.org>2016-04-23 15:12:10 +0300
commit65cbbd037b3d7be0a40bbdb5da9d43b0fccf17ee (patch)
tree02b22c99008630010f28f45f502f55915f1014c2 /scripts
parent9243ae5b28d02dc7d71a4f00c981ef6feaede3f1 (diff)
parentb303e7c15d53cd8ef6b349b702e07eee3f102792 (diff)
downloadlinux-65cbbd037b3d7be0a40bbdb5da9d43b0fccf17ee.tar.xz
Merge branch 'perf/urgent' into perf/core, to resolve conflict
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/asn1_compiler.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/asn1_compiler.c b/scripts/asn1_compiler.c
index e000f44e37b8..c1b7ef3e24c1 100644
--- a/scripts/asn1_compiler.c
+++ b/scripts/asn1_compiler.c
@@ -650,7 +650,7 @@ int main(int argc, char **argv)
}
hdr = fopen(headername, "w");
- if (!out) {
+ if (!hdr) {
perror(headername);
exit(1);
}