diff options
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/arcfb.c | 4 | ||||
-rw-r--r-- | drivers/video/atmel_lcdfb.c | 2 | ||||
-rw-r--r-- | drivers/video/aty/atyfb_base.c | 2 | ||||
-rw-r--r-- | drivers/video/aty/radeon_base.c | 2 | ||||
-rw-r--r-- | drivers/video/backlight/88pm860x_bl.c | 1 | ||||
-rw-r--r-- | drivers/video/bfin_adv7393fb.c | 2 | ||||
-rw-r--r-- | drivers/video/cirrusfb.c | 2 | ||||
-rw-r--r-- | drivers/video/exynos/exynos_dp_reg.c | 2 | ||||
-rw-r--r-- | drivers/video/exynos/exynos_mipi_dsi.c | 2 | ||||
-rw-r--r-- | drivers/video/i740fb.c | 6 | ||||
-rw-r--r-- | drivers/video/s3c-fb.c | 2 | ||||
-rw-r--r-- | drivers/video/savage/savagefb_driver.c | 6 | ||||
-rw-r--r-- | drivers/video/sis/init.c | 3 | ||||
-rw-r--r-- | drivers/video/smscufx.c | 8 | ||||
-rw-r--r-- | drivers/video/sunxvr500.c | 2 |
15 files changed, 24 insertions, 22 deletions
diff --git a/drivers/video/arcfb.c b/drivers/video/arcfb.c index c22e8d3..a1d58e9 100644 --- a/drivers/video/arcfb.c +++ b/drivers/video/arcfb.c @@ -336,8 +336,8 @@ static void arcfb_lcd_update_horiz(struct arcfb_par *par, unsigned int left, } /* - * here we start the process of spliting out the fb update into - * individual blocks of pixels. we end up spliting into 64x64 blocks + * here we start the process of splitting out the fb update into + * individual blocks of pixels. we end up splitting into 64x64 blocks * and finally down to 64x8 pages. */ static void arcfb_lcd_update(struct arcfb_par *par, unsigned int dx, diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c index d99505b..1505539 100644 --- a/drivers/video/atmel_lcdfb.c +++ b/drivers/video/atmel_lcdfb.c @@ -939,7 +939,7 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev) * up a splash image. */ } else { - /* alocate memory buffer */ + /* allocate memory buffer */ ret = atmel_lcdfb_alloc_video_memory(sinfo); if (ret < 0) { dev_err(dev, "cannot allocate framebuffer: %d\n", ret); diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c index 622f12b..3f2e8c1 100644 --- a/drivers/video/aty/atyfb_base.c +++ b/drivers/video/aty/atyfb_base.c @@ -863,7 +863,7 @@ static int aty_var_to_crtc(const struct fb_info *info, if ((xres > 1600) || (yres > 1200)) { FAIL("MACH64 chips are designed for max 1600x1200\n" - "select anoter resolution."); + "select another resolution."); } h_sync_strt = h_disp + var->right_margin; h_sync_end = h_sync_strt + var->hsync_len; diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c index ce1506b..9e279ee 100644 --- a/drivers/video/aty/radeon_base.c +++ b/drivers/video/aty/radeon_base.c @@ -2018,7 +2018,7 @@ static void radeon_identify_vram(struct radeonfb_info *rinfo) if ((rinfo->family == CHIP_FAMILY_RS100) || (rinfo->family == CHIP_FAMILY_RS200)) { /* This is to workaround the asic bug for RMX, some versions - of BIOS dosen't have this register initialized correctly. + of BIOS doesn't have this register initialized correctly. */ OUTREGP(CRTC_MORE_CNTL, CRTC_H_CUTOFF_ACTIVE_EN, ~CRTC_H_CUTOFF_ACTIVE_EN); diff --git a/drivers/video/backlight/88pm860x_bl.c b/drivers/video/backlight/88pm860x_bl.c index f49181c..f75da87 100644 --- a/drivers/video/backlight/88pm860x_bl.c +++ b/drivers/video/backlight/88pm860x_bl.c @@ -228,6 +228,7 @@ static int pm860x_backlight_probe(struct platform_device *pdev) data->port = pdata->flags; if (data->port < 0) { dev_err(&pdev->dev, "wrong platform data is assigned"); + kfree(data); return -EINVAL; } diff --git a/drivers/video/bfin_adv7393fb.c b/drivers/video/bfin_adv7393fb.c index 9bdd4b0..d0f121b 100644 --- a/drivers/video/bfin_adv7393fb.c +++ b/drivers/video/bfin_adv7393fb.c @@ -58,7 +58,7 @@ static const unsigned short ppi_pins[] = { */ static struct bfin_adv7393_fb_par { - /* structure holding blackfin / adv7393 paramters when + /* structure holding blackfin / adv7393 parameters when screen is blanked */ struct { u8 Mode; /* ntsc/pal/? */ diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c index 738c8ce..bc67d05 100644 --- a/drivers/video/cirrusfb.c +++ b/drivers/video/cirrusfb.c @@ -1611,7 +1611,7 @@ static void init_vgachip(struct fb_info *info) /* ext. display controls: ext.adr. wrap */ vga_wcrt(cinfo->regbase, CL_CRT1B, 0x02); - /* Set/Reset registes: - */ + /* Set/Reset registers: - */ vga_wgfx(cinfo->regbase, VGA_GFX_SR_VALUE, 0x00); /* Set/Reset enable: - */ vga_wgfx(cinfo->regbase, VGA_GFX_SR_ENABLE, 0x00); diff --git a/drivers/video/exynos/exynos_dp_reg.c b/drivers/video/exynos/exynos_dp_reg.c index 6ce76d5..bcb0e3a 100644 --- a/drivers/video/exynos/exynos_dp_reg.c +++ b/drivers/video/exynos/exynos_dp_reg.c @@ -752,7 +752,7 @@ int exynos_dp_read_bytes_from_i2c(struct exynos_dp_device *dp, /* * If Rx sends defer, Tx sends only reads - * request without sending addres + * request without sending address */ if (!defer) retval = exynos_dp_select_i2c_device(dp, diff --git a/drivers/video/exynos/exynos_mipi_dsi.c b/drivers/video/exynos/exynos_mipi_dsi.c index 6c1f5c3..9908e75 100644 --- a/drivers/video/exynos/exynos_mipi_dsi.c +++ b/drivers/video/exynos/exynos_mipi_dsi.c @@ -106,7 +106,7 @@ static void exynos_mipi_update_cfg(struct mipi_dsim_device *dsim) /* * data from Display controller(FIMD) is transferred in video mode - * but in case of command mode, all settigs is updated to registers. + * but in case of command mode, all settings are updated to registers. */ exynos_mipi_dsi_stand_by(dsim, 1); } diff --git a/drivers/video/i740fb.c b/drivers/video/i740fb.c index fe574d8..ff3f880 100644 --- a/drivers/video/i740fb.c +++ b/drivers/video/i740fb.c @@ -497,7 +497,7 @@ static int i740fb_decode_var(const struct fb_var_screeninfo *var, mem = vxres * vyres * ((bpp + 1) / 8); if (mem > info->screen_size) { - dev_err(info->device, "not enough video memory (%d KB requested, %ld KB avaliable)\n", + dev_err(info->device, "not enough video memory (%d KB requested, %ld KB available)\n", mem >> 10, info->screen_size >> 10); return -ENOMEM; } @@ -728,7 +728,7 @@ static void vga_protect(struct i740fb_par *par) i740outreg_mask(par, VGA_SEQ_I, VGA_SEQ_CLOCK_MODE, 0x20, 0x20); i740inb(par, 0x3DA); - i740outb(par, VGA_ATT_W, 0x00); /* enable pallete access */ + i740outb(par, VGA_ATT_W, 0x00); /* enable palette access */ } static void vga_unprotect(struct i740fb_par *par) @@ -737,7 +737,7 @@ static void vga_unprotect(struct i740fb_par *par) i740outreg_mask(par, VGA_SEQ_I, VGA_SEQ_CLOCK_MODE, 0, 0x20); i740inb(par, 0x3DA); - i740outb(par, VGA_ATT_W, 0x20); /* disable pallete access */ + i740outb(par, VGA_ATT_W, 0x20); /* disable palette access */ } static int i740fb_set_par(struct fb_info *info) diff --git a/drivers/video/s3c-fb.c b/drivers/video/s3c-fb.c index ea7b661..69bf9d0 100644 --- a/drivers/video/s3c-fb.c +++ b/drivers/video/s3c-fb.c @@ -189,7 +189,7 @@ struct s3c_fb_vsync { /** * struct s3c_fb - overall hardware state of the hardware - * @slock: The spinlock protection for this data sturcture. + * @slock: The spinlock protection for this data sturucture. * @dev: The device that we bound to, for printing, etc. * @bus_clk: The clk (hclk) feeding our interface and possibly pixclk. * @lcd_clk: The clk (sclk) feeding pixclk. diff --git a/drivers/video/savage/savagefb_driver.c b/drivers/video/savage/savagefb_driver.c index f3d3b9c..0d0f52c 100644 --- a/drivers/video/savage/savagefb_driver.c +++ b/drivers/video/savage/savagefb_driver.c @@ -662,7 +662,7 @@ static void savage_get_default_par(struct savagefb_par *par, struct savage_reg * vga_out8(0x3c4, 0x18, par); reg->SR18 = vga_in8(0x3c5, par); - /* Save flat panel expansion regsters. */ + /* Save flat panel expansion registers. */ if (par->chip == S3_SAVAGE_MX) { int i; @@ -815,7 +815,7 @@ static void savage_set_default_par(struct savagefb_par *par, vga_out8(0x3c4, 0x18, par); vga_out8(0x3c5, reg->SR18, par); - /* Save flat panel expansion regsters. */ + /* Save flat panel expansion registers. */ if (par->chip == S3_SAVAGE_MX) { int i; @@ -1318,7 +1318,7 @@ static void savagefb_set_par_int(struct savagefb_par *par, struct savage_reg *r vga_out8(0x3c4, 0x15, par); vga_out8(0x3c5, reg->SR15, par); - /* Restore flat panel expansion regsters. */ + /* Restore flat panel expansion registers. */ if (par->chip == S3_SAVAGE_MX) { int i; diff --git a/drivers/video/sis/init.c b/drivers/video/sis/init.c index 66de8323..f082ae5 100644 --- a/drivers/video/sis/init.c +++ b/drivers/video/sis/init.c @@ -2628,7 +2628,8 @@ SiS_SetVCLKState(struct SiS_Private *SiS_Pr, unsigned short ModeNo, else if(VCLK >= 135) data = 0x02; if(SiS_Pr->ChipType == SIS_540) { - if((VCLK == 203) || (VCLK < 234)) data = 0x02; + /* Was == 203 or < 234 which made no sense */ + if (VCLK < 234) data = 0x02; } if(SiS_Pr->ChipType < SIS_315H) { diff --git a/drivers/video/smscufx.c b/drivers/video/smscufx.c index af3ef27..26f8642 100644 --- a/drivers/video/smscufx.c +++ b/drivers/video/smscufx.c @@ -1,7 +1,7 @@ /* * smscufx.c -- Framebuffer driver for SMSC UFX USB controller * - * Copyright (C) 2011 Steve Glendinning <steve.glendinning@smsc.com> + * Copyright (C) 2011 Steve Glendinning <steve.glendinning@shawell.net> * Copyright (C) 2009 Roberto De Ioris <roberto@unbit.it> * Copyright (C) 2009 Jaya Kumar <jayakumar.lkml@gmail.com> * Copyright (C) 2009 Bernie Thompson <bernie@plugable.com> @@ -1002,7 +1002,7 @@ static int ufx_ops_ioctl(struct fb_info *info, unsigned int cmd, /* TODO: Help propose a standard fb.h ioctl to report mmap damage */ if (cmd == UFX_IOCTL_REPORT_DAMAGE) { /* If we have a damage-aware client, turn fb_defio "off" - * To avoid perf imact of unecessary page fault handling. + * To avoid perf imact of unnecessary page fault handling. * Done by resetting the delay for this fb_info to a very * long period. Pages will become writable and stay that way. * Reset to normal value when all clients have closed this fb. @@ -1466,7 +1466,7 @@ static int ufx_read_edid(struct ufx_data *dev, u8 *edid, int edid_len) /* all FF's in the first 16 bytes indicates nothing is connected */ for (i = 0; i < 16; i++) { if (edid[i] != 0xFF) { - pr_debug("edid data read succesfully"); + pr_debug("edid data read successfully"); return EDID_LENGTH; } } @@ -1972,6 +1972,6 @@ MODULE_PARM_DESC(console, "Allow fbcon to be used on this display"); module_param(fb_defio, bool, S_IWUSR | S_IRUSR | S_IWGRP | S_IRGRP); MODULE_PARM_DESC(fb_defio, "Enable fb_defio mmap support"); -MODULE_AUTHOR("Steve Glendinning <steve.glendinning@smsc.com>"); +MODULE_AUTHOR("Steve Glendinning <steve.glendinning@shawell.net>"); MODULE_DESCRIPTION("SMSC UFX kernel framebuffer driver"); MODULE_LICENSE("GPL"); diff --git a/drivers/video/sunxvr500.c b/drivers/video/sunxvr500.c index b9c2b94..eb931b8 100644 --- a/drivers/video/sunxvr500.c +++ b/drivers/video/sunxvr500.c @@ -12,7 +12,7 @@ #include <asm/io.h> -/* XXX This device has a 'dev-comm' property which aparently is +/* XXX This device has a 'dev-comm' property which apparently is * XXX a pointer into the openfirmware's address space which is * XXX a shared area the kernel driver can use to keep OBP * XXX informed about the current resolution setting. The idea |