Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-17 01:22:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

This pull-request merely contains some very basic build/run-time bug fixes.

Browse Source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJTmWOeAAoJEFGvii+H/HdhA38P/1mp7qIEy8k7t2hvBETjYPSt
 l846xJPgmzhoAlrvulaRSCOU2Z/G2VQUBV5kz3oGve6ZZPvU8Hs76mxJkLtYP44B
 3foSShfnGpXqUlP6oVjSAlwfiWZe6A9mjFpKboXEVqhWprxOBEp8QubqTxKOtd64
 FyRk/REbebNPmyggQwIGl2NxMr2LI2wDhVAVAJ2orFc+oShustFVwaUA/qSjy0Tc
 Cqed18w7R7cLdemgCHTF7kQDBqKL9wtta1oRl1TxhOgbOnroJfpos1SpIBZXQZ8u
 LoQQ1gljafqccj9HrV1JY7+BI1XePzrG/8Amu26/IkU/eVX+6tfK60BjM1hjb51Y
 MVuSvTn65T6ZqIPZ3Z9av5o0ZQJMmFQhRqQv+AM56eXEyNUXrS36HsajjtYK99a6
 rVg2G8qdQdQr7K19FoFmWnUy+NDfWeAaNRUG8DcNISaV5V3mw9XEJ3Yyh/7MnFde
 MmWDtV2R01WtBeSWkifn52gg4253SNxmHkWXqSWSvTyqnNPuPCJec15eYjaLvomC
 Ue3lcMCD0NdQpaID7CHIHdnazYbKwPnH7QJkrjmJ0pYIkNwYY+t/t2+90psjp3+3
 e4F3evYAj7vLdEwHaLEOmuvj4k/0z7Kf7gdugLKPeAmw9+T0PUJqbPvhn2lXMETN
 pQWlLA8PXTZR76b+X2+m
 =6hH0
 -----END PGP SIGNATURE-----

Merge tag 'backlight-for-linus-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight

Pull backlight fixes from Lee Jones:
 "This merely contains some very basic build/run-time bug fixes"

* tag 'backlight-for-linus-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
  backlight: gpio-backlight: Fix warning when the GPIO is on a I2C chip
  video/backlight: s6e63m0: Fix string type mismatch
  video/backlight: LP8788 needs PWM
  video/backlight: LP855X needs PWM
  video/pxa: LCD_CORGI needs BACKLIGHT_CLASS_DEVICE
  video/backlight: LM3630A needs PWM
This commit is contained in:
Linus Torvalds 2014-06-12 12:45:50 -07:00
commit af76004cf8
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/video/backlight/Kconfig
View File

@ -29,7 +29,7 @@ if LCD_CLASS_DEVICE
config LCD_CORGI
tristate "LCD Panel support for SHARP corgi/spitz model"
depends on SPI_MASTER && PXA_SHARPSL
depends on SPI_MASTER && PXA_SHARPSL && BACKLIGHT_CLASS_DEVICE
help
Say y here to support the LCD panels usually found on SHARP
corgi (C7x0) and spitz (Cxx00) models.
@ -370,7 +370,7 @@ config BACKLIGHT_AAT2870
config BACKLIGHT_LM3630A
tristate "Backlight Driver for LM3630A"
depends on BACKLIGHT_CLASS_DEVICE && I2C
depends on BACKLIGHT_CLASS_DEVICE && I2C && PWM
select REGMAP_I2C
help
This supports TI LM3630A Backlight Driver
@ -386,14 +386,14 @@ config BACKLIGHT_LM3639
config BACKLIGHT_LP855X
tristate "Backlight driver for TI LP855X"
depends on BACKLIGHT_CLASS_DEVICE && I2C
depends on BACKLIGHT_CLASS_DEVICE && I2C && PWM
help
This supports TI LP8550, LP8551, LP8552, LP8553, LP8555, LP8556 and
LP8557 backlight driver.
config BACKLIGHT_LP8788
tristate "Backlight driver for TI LP8788 MFD"
depends on BACKLIGHT_CLASS_DEVICE && MFD_LP8788
depends on BACKLIGHT_CLASS_DEVICE && MFD_LP8788 && PWM
help
This supports TI LP8788 backlight driver.

3
drivers/video/backlight/gpio_backlight.c
View File

@ -38,7 +38,8 @@ static int gpio_backlight_update_status(struct backlight_device *bl)
bl->props.state & (BL_CORE_SUSPENDED | BL_CORE_FBBLANK))
brightness = 0;
gpio_set_value(gbl->gpio, brightness ? gbl->active : !gbl->active);
gpio_set_value_cansleep(gbl->gpio,
brightness ? gbl->active : !gbl->active);
return 0;
}

2
drivers/video/backlight/s6e63m0.c
View File

@ -703,7 +703,7 @@ static ssize_t s6e63m0_sysfs_show_gamma_table(struct device *dev,
struct s6e63m0 *lcd = dev_get_drvdata(dev);
char temp[3];
sprintf(temp, "%d\n", lcd->gamma_table_count);
sprintf(temp, "%u\n", lcd->gamma_table_count);
strcpy(buf, temp);
return strlen(buf);