diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
| commit | bac30d1a78d0f11c613968fc8b351a91ed465386 (patch) | |
| tree | e52f3c876522a2f6047a6ec1c27df2e8a79486b8 /drivers/video/fbsysfs.c | |
| parent | e8222502ee6157e2713da9e0792c21f4ad458d50 (diff) | |
| parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/video/fbsysfs.c')
| -rw-r--r-- | drivers/video/fbsysfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/fbsysfs.c b/drivers/video/fbsysfs.c index 6d26057337e2..b72b05250a9d 100644 --- a/drivers/video/fbsysfs.c +++ b/drivers/video/fbsysfs.c | |||
| @@ -348,7 +348,7 @@ static ssize_t store_cmap(struct class_device *class_device, const char *buf, | |||
| 348 | fb_copy_cmap(&umap, &fb_info->cmap); | 348 | fb_copy_cmap(&umap, &fb_info->cmap); |
| 349 | fb_dealloc_cmap(&umap); | 349 | fb_dealloc_cmap(&umap); |
| 350 | 350 | ||
| 351 | return rc; | 351 | return rc ?: count; |
| 352 | } | 352 | } |
| 353 | for (i = 0; i < length; i++) { | 353 | for (i = 0; i < length; i++) { |
| 354 | u16 red, blue, green, tsp; | 354 | u16 red, blue, green, tsp; |
| @@ -367,7 +367,7 @@ static ssize_t store_cmap(struct class_device *class_device, const char *buf, | |||
| 367 | if (transp) | 367 | if (transp) |
| 368 | fb_info->cmap.transp[i] = tsp; | 368 | fb_info->cmap.transp[i] = tsp; |
| 369 | } | 369 | } |
| 370 | return 0; | 370 | return count; |
| 371 | } | 371 | } |
| 372 | 372 | ||
| 373 | static ssize_t show_cmap(struct class_device *class_device, char *buf) | 373 | static ssize_t show_cmap(struct class_device *class_device, char *buf) |