git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
[pandora-kernel.git]
/
drivers
/
video
/
backlight
/
s6e63m0.c
diff --git
a/drivers/video/backlight/s6e63m0.c
b/drivers/video/backlight/s6e63m0.c
index
a3128c9
..
5927db0
100644
(file)
--- a/
drivers/video/backlight/s6e63m0.c
+++ b/
drivers/video/backlight/s6e63m0.c
@@
-729,10
+729,10
@@
static ssize_t s6e63m0_sysfs_show_gamma_table(struct device *dev,
return strlen(buf);
}
return strlen(buf);
}
-static DEVICE_ATTR(gamma_table, 0
6
44,
+static DEVICE_ATTR(gamma_table, 0
4
44,
s6e63m0_sysfs_show_gamma_table, NULL);
s6e63m0_sysfs_show_gamma_table, NULL);
-static int __init s6e63m0_probe(struct spi_device *spi)
+static int __
dev
init s6e63m0_probe(struct spi_device *spi)
{
int ret = 0;
struct s6e63m0 *lcd = NULL;
{
int ret = 0;
struct s6e63m0 *lcd = NULL;
@@
-829,6
+829,9
@@
static int __devexit s6e63m0_remove(struct spi_device *spi)
struct s6e63m0 *lcd = dev_get_drvdata(&spi->dev);
s6e63m0_power(lcd, FB_BLANK_POWERDOWN);
struct s6e63m0 *lcd = dev_get_drvdata(&spi->dev);
s6e63m0_power(lcd, FB_BLANK_POWERDOWN);
+ device_remove_file(&spi->dev, &dev_attr_gamma_table);
+ device_remove_file(&spi->dev, &dev_attr_gamma_mode);
+ backlight_device_unregister(lcd->bd);
lcd_device_unregister(lcd->ld);
kfree(lcd);
lcd_device_unregister(lcd->ld);
kfree(lcd);