diff options
Diffstat (limited to 'util-linux/fbset.c')
-rw-r--r-- | util-linux/fbset.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/util-linux/fbset.c b/util-linux/fbset.c index d616abd36..ab7770d4f 100644 --- a/util-linux/fbset.c +++ b/util-linux/fbset.c | |||
@@ -170,10 +170,10 @@ enum { | |||
170 | }; | 170 | }; |
171 | #endif | 171 | #endif |
172 | 172 | ||
173 | #if ENABLE_FEATURE_FBSET_READMODE | ||
173 | static int readmode(struct fb_var_screeninfo *base, const char *fn, | 174 | static int readmode(struct fb_var_screeninfo *base, const char *fn, |
174 | const char *mode) | 175 | const char *mode) |
175 | { | 176 | { |
176 | #if ENABLE_FEATURE_FBSET_READMODE | ||
177 | FILE *f; | 177 | FILE *f; |
178 | char buf[256]; | 178 | char buf[256]; |
179 | char *p = buf; | 179 | char *p = buf; |
@@ -257,11 +257,9 @@ static int readmode(struct fb_var_screeninfo *base, const char *fn, | |||
257 | return 1; | 257 | return 1; |
258 | } | 258 | } |
259 | } | 259 | } |
260 | #else | ||
261 | bb_error_msg("mode reading not compiled in"); | ||
262 | #endif | ||
263 | return 0; | 260 | return 0; |
264 | } | 261 | } |
262 | #endif | ||
265 | 263 | ||
266 | static inline void setmode(struct fb_var_screeninfo *base, | 264 | static inline void setmode(struct fb_var_screeninfo *base, |
267 | struct fb_var_screeninfo *set) | 265 | struct fb_var_screeninfo *set) |
@@ -389,9 +387,13 @@ int fbset_main(int argc, char **argv) | |||
389 | fh = xopen(fbdev, O_RDONLY); | 387 | fh = xopen(fbdev, O_RDONLY); |
390 | xioctl(fh, FBIOGET_VSCREENINFO, &var); | 388 | xioctl(fh, FBIOGET_VSCREENINFO, &var); |
391 | if (g_options & OPT_READMODE) { | 389 | if (g_options & OPT_READMODE) { |
390 | #if !ENABLE_FEATURE_FBSET_READMODE | ||
391 | bb_show_usage(); | ||
392 | #else | ||
392 | if (!readmode(&var, modefile, mode)) { | 393 | if (!readmode(&var, modefile, mode)) { |
393 | bb_error_msg_and_die("unknown video mode '%s'", mode); | 394 | bb_error_msg_and_die("unknown video mode '%s'", mode); |
394 | } | 395 | } |
396 | #endif | ||
395 | } | 397 | } |
396 | 398 | ||
397 | setmode(&var, &varset); | 399 | setmode(&var, &varset); |