diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2013-06-28 06:01:28 -0400 |
|---|---|---|
| committer | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2013-06-28 06:01:28 -0400 |
| commit | 19fd7441e9cc29b6c6d73c5469b3c93aa245fbb5 (patch) | |
| tree | ab5e98ae677baecab3155b34983d97ffd08281c0 /drivers/video/fbmem.c | |
| parent | b75bf98b5d2b7fdb876d3dd7eaec8246d4cc7174 (diff) | |
| parent | 464d8a54a0ca7827a2278e2122e5eb22462ae044 (diff) | |
Merge tag 'fbdev-3.11-2' of git://gitorious.org/linux-omap-dss2/linux into fbdev/for-next
Various fbdev changes for 3.11
* xilinxfb updates
* Small cleanups and fixes to multiple drivers
Diffstat (limited to 'drivers/video/fbmem.c')
| -rw-r--r-- | drivers/video/fbmem.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c index d8d5779145db..36e1fe21b9b5 100644 --- a/drivers/video/fbmem.c +++ b/drivers/video/fbmem.c | |||
| @@ -1305,7 +1305,9 @@ static int do_fscreeninfo_to_user(struct fb_fix_screeninfo *fix, | |||
| 1305 | err |= copy_to_user(fix32->reserved, fix->reserved, | 1305 | err |= copy_to_user(fix32->reserved, fix->reserved, |
| 1306 | sizeof(fix->reserved)); | 1306 | sizeof(fix->reserved)); |
| 1307 | 1307 | ||
| 1308 | return err; | 1308 | if (err) |
| 1309 | return -EFAULT; | ||
| 1310 | return 0; | ||
| 1309 | } | 1311 | } |
| 1310 | 1312 | ||
| 1311 | static int fb_get_fscreeninfo(struct fb_info *info, unsigned int cmd, | 1313 | static int fb_get_fscreeninfo(struct fb_info *info, unsigned int cmd, |