diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-15 01:33:11 -0500 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-15 01:33:11 -0500 |
commit | 1bb95834bbcdc969e477a9284cf96c17a4c2616f (patch) | |
tree | 9cf66b22a611bb6bc78778c05dac72263bb45a23 /scripts/kallsyms.c | |
parent | 85345517fe6d4de27b0d6ca19fef9d28ac947c4a (diff) | |
parent | a41c73e04673b47730df682446f0d52f95e32a5b (diff) |
Merge remote branch 'airlied/drm-fixes' into drm-intel-fixes
Diffstat (limited to 'scripts/kallsyms.c')
-rw-r--r-- | scripts/kallsyms.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/scripts/kallsyms.c b/scripts/kallsyms.c index e3902fb39afd..60dd3eb9366e 100644 --- a/scripts/kallsyms.c +++ b/scripts/kallsyms.c | |||
@@ -107,12 +107,8 @@ static int read_symbol(FILE *in, struct sym_entry *s) | |||
107 | 107 | ||
108 | rc = fscanf(in, "%llx %c %499s\n", &s->addr, &stype, str); | 108 | rc = fscanf(in, "%llx %c %499s\n", &s->addr, &stype, str); |
109 | if (rc != 3) { | 109 | if (rc != 3) { |
110 | if (rc != EOF) { | 110 | if (rc != EOF && fgets(str, 500, in) == NULL) |
111 | /* skip line. sym is used as dummy to | 111 | fprintf(stderr, "Read error or end of file.\n"); |
112 | * shut of "warn_unused_result" warning. | ||
113 | */ | ||
114 | sym = fgets(str, 500, in); | ||
115 | } | ||
116 | return -1; | 112 | return -1; |
117 | } | 113 | } |
118 | 114 | ||