diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-07-11 01:58:04 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-07-11 01:58:04 -0400 |
| commit | e0d21d9cca25f424f3129649be48a63c128ed42d (patch) | |
| tree | 0a7d407639876e02deef1721817615eaa8c673a3 /drivers/video/fbsysfs.c | |
| parent | beffbdc2211826b174c68307b1b48c93c05d7ded (diff) | |
| parent | 5c23804a0941a111752fdacefe0bea2db1b4d93f (diff) | |
Merge rsync://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/video/fbsysfs.c')
| -rw-r--r-- | drivers/video/fbsysfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/fbsysfs.c b/drivers/video/fbsysfs.c index 7dfbf39b4ed3..ddc9443254d9 100644 --- a/drivers/video/fbsysfs.c +++ b/drivers/video/fbsysfs.c | |||
| @@ -256,7 +256,7 @@ static ssize_t show_cmap(struct class_device *class_device, char *buf) | |||
| 256 | unsigned int offset = 0, i; | 256 | unsigned int offset = 0, i; |
| 257 | 257 | ||
| 258 | if (!fb_info->cmap.red || !fb_info->cmap.blue || | 258 | if (!fb_info->cmap.red || !fb_info->cmap.blue || |
| 259 | fb_info->cmap.green || fb_info->cmap.transp) | 259 | !fb_info->cmap.green || !fb_info->cmap.transp) |
| 260 | return -EINVAL; | 260 | return -EINVAL; |
| 261 | 261 | ||
| 262 | for (i = 0; i < fb_info->cmap.len; i++) { | 262 | for (i = 0; i < fb_info->cmap.len; i++) { |