diff options
author | Hannes Eder <hannes@hanneseder.net> | 2009-01-06 17:42:32 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-06 18:59:26 -0500 |
commit | 6875145940efdc9851df8aaa251453d33cda62a4 (patch) | |
tree | 03ad7ba0456cff79077ea47791195a96530d708f | |
parent | 6405141fb3d06ec4a50d054a113e3317cad054f9 (diff) |
nvidia: fix sparse warnings
Fix this sparse warnings:
drivers/video/nvidia/nv_accel.c:304:3: warning: returning void-valued expression
drivers/video/nvidia/nv_accel.c:323:3: warning: returning void-valued expression
Signed-off-by: Hannes Eder <hannes@hanneseder.net>
Cc: Krzysztof Helt <krzysztof.h1@poczta.fm>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/video/nvidia/nv_accel.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/video/nvidia/nv_accel.c b/drivers/video/nvidia/nv_accel.c index fa4821c5572b..ad6472a894ea 100644 --- a/drivers/video/nvidia/nv_accel.c +++ b/drivers/video/nvidia/nv_accel.c | |||
@@ -300,8 +300,10 @@ void nvidiafb_copyarea(struct fb_info *info, const struct fb_copyarea *region) | |||
300 | if (info->state != FBINFO_STATE_RUNNING) | 300 | if (info->state != FBINFO_STATE_RUNNING) |
301 | return; | 301 | return; |
302 | 302 | ||
303 | if (par->lockup) | 303 | if (par->lockup) { |
304 | return cfb_copyarea(info, region); | 304 | cfb_copyarea(info, region); |
305 | return; | ||
306 | } | ||
305 | 307 | ||
306 | NVDmaStart(info, par, BLIT_POINT_SRC, 3); | 308 | NVDmaStart(info, par, BLIT_POINT_SRC, 3); |
307 | NVDmaNext(par, (region->sy << 16) | region->sx); | 309 | NVDmaNext(par, (region->sy << 16) | region->sx); |
@@ -319,8 +321,10 @@ void nvidiafb_fillrect(struct fb_info *info, const struct fb_fillrect *rect) | |||
319 | if (info->state != FBINFO_STATE_RUNNING) | 321 | if (info->state != FBINFO_STATE_RUNNING) |
320 | return; | 322 | return; |
321 | 323 | ||
322 | if (par->lockup) | 324 | if (par->lockup) { |
323 | return cfb_fillrect(info, rect); | 325 | cfb_fillrect(info, rect); |
326 | return; | ||
327 | } | ||
324 | 328 | ||
325 | if (info->var.bits_per_pixel == 8) | 329 | if (info->var.bits_per_pixel == 8) |
326 | color = rect->color; | 330 | color = rect->color; |