diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 23:17:39 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 23:17:39 +0100 |
| commit | 034ee299122c6b145d6d3cafb9ef5c329a4ab990 (patch) | |
| tree | 0fb4dba7b72d28e1dc4d3bab1317a9a98302a7a5 /drivers/video/omap2/omapfb/omapfb-sysfs.c | |
| parent | d6bb0f27709b91e674ce1441e2dd5e68620edf14 (diff) | |
| parent | 3e28189038bb831512cf4f8313e1aead97c3e63f (diff) | |
| download | linux-034ee299122c6b145d6d3cafb9ef5c329a4ab990.tar.bz2 | |
Merge branch 'depends/omap2_dss' into next/cleanup
Omap cleanups conflicted with omap2_dss work in a nontrivial
way, this is the most logical fixup.
Conflicts:
arch/arm/mach-omap2/board-2430sdp.c
arch/arm/mach-omap2/board-4430sdp.c
arch/arm/mach-omap2/board-apollon.c
arch/arm/mach-omap2/board-h4.c
arch/arm/mach-omap2/board-ldp.c
arch/arm/mach-omap2/board-rx51.c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/video/omap2/omapfb/omapfb-sysfs.c')
| -rw-r--r-- | drivers/video/omap2/omapfb/omapfb-sysfs.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/video/omap2/omapfb/omapfb-sysfs.c b/drivers/video/omap2/omapfb/omapfb-sysfs.c index 153bf1aceebc..1694d5148f32 100644 --- a/drivers/video/omap2/omapfb/omapfb-sysfs.c +++ b/drivers/video/omap2/omapfb/omapfb-sysfs.c @@ -104,16 +104,14 @@ static ssize_t store_mirror(struct device *dev, { struct fb_info *fbi = dev_get_drvdata(dev); struct omapfb_info *ofbi = FB2OFB(fbi); - int mirror; + bool mirror; int r; struct fb_var_screeninfo new_var; - r = kstrtoint(buf, 0, &mirror); + r = strtobool(buf, &mirror); if (r) return r; - mirror = !!mirror; - if (!lock_fb_info(fbi)) return -ENODEV; |