The patch titled
add new Cobalt LCD framebuffer driver
has been removed from the -mm tree. Its filename was
fbdev-add-new-cobalt-lcd-framebuffer-driver-v3.patch
This patch was dropped because it was folded into fbdev-add-new-cobalt-lcd-framebuffer-driver.patch
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: add new Cobalt LCD framebuffer driver
From: Yoichi Yuasa <yoichi_yuasa@xxxxxxxxxxxxxx>
- fix read/write count boundary check.
- add <include/uaccess.h>.
- fix MODULE_AUTHOR.
Signed-off-by: Yoichi Yuasa <yoichi_yuasa@xxxxxxxxxxxxxx>
Acked-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
Cc: Krzysztof Helt <krzysztof.h1@xxxxxxxxx>
Cc: "Antonino A. Daplas" <adaplas@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/video/Kconfig | 2 +-
drivers/video/cobalt_lcdfb.c | 24 ++++++++++++++++++------
2 files changed, 19 insertions(+), 7 deletions(-)
diff -puN drivers/video/Kconfig~fbdev-add-new-cobalt-lcd-framebuffer-driver-v3 drivers/video/Kconfig
--- a/drivers/video/Kconfig~fbdev-add-new-cobalt-lcd-framebuffer-driver-v3
+++ a/drivers/video/Kconfig
@@ -1989,7 +1989,7 @@ config FB_AM200EPD
config FB_COBALT
tristate "Cobalt server LCD frame buffer support"
- depends on FB
+ depends on FB && MIPS_COBALT
config FB_VIRTUAL
tristate "Virtual Frame Buffer support (ONLY FOR TESTING!)"
diff -puN drivers/video/cobalt_lcdfb.c~fbdev-add-new-cobalt-lcd-framebuffer-driver-v3 drivers/video/cobalt_lcdfb.c
--- a/drivers/video/cobalt_lcdfb.c~fbdev-add-new-cobalt-lcd-framebuffer-driver-v3
+++ a/drivers/video/cobalt_lcdfb.c
@@ -137,13 +137,16 @@ static ssize_t cobalt_lcdfb_read(struct
{
char src[LCD_CHARS_MAX];
unsigned long pos;
- int len, retval;
+ int len, retval = 0;
pos = *ppos;
- if (pos >= LCD_CHARS_MAX)
+ if (pos >= LCD_CHARS_MAX || count == 0)
return 0;
- if (pos + count >= LCD_CHARS_MAX)
+ if (count > LCD_CHARS_MAX)
+ count = LCD_CHARS_MAX;
+
+ if (pos + count > LCD_CHARS_MAX)
count = LCD_CHARS_MAX - pos;
for (len = 0; len < count; len++) {
@@ -164,6 +167,9 @@ static ssize_t cobalt_lcdfb_read(struct
pos++;
}
+ if (retval < 0 && signal_pending(current))
+ return -ERESTARTSYS;
+
if (copy_to_user(buf, src, len))
return -EFAULT;
@@ -177,13 +183,16 @@ static ssize_t cobalt_lcdfb_write(struct
{
char dst[LCD_CHARS_MAX];
unsigned long pos;
- int len, retval;
+ int len, retval = 0;
pos = *ppos;
- if (pos >= LCD_CHARS_MAX)
+ if (pos >= LCD_CHARS_MAX || count == 0)
return 0;
- if (pos + count >= LCD_CHARS_MAX)
+ if (count > LCD_CHARS_MAX)
+ count = LCD_CHARS_MAX;
+
+ if (pos + count > LCD_CHARS_MAX)
count = LCD_CHARS_MAX - pos;
if (copy_from_user(dst, buf, count))
@@ -207,6 +216,9 @@ static ssize_t cobalt_lcdfb_write(struct
pos++;
}
+ if (retval < 0 && signal_pending(current))
+ return -ERESTARTSYS;
+
*ppos += len;
return len;
_
Patches currently in -mm which might be from yoichi_yuasa@xxxxxxxxxxxxxx are
origin.patch
rtc-vr41xx-add-irq_set_freq-and-irq_set_state.patch
fbdev-add-new-cobalt-lcd-framebuffer-driver.patch
fbdev-add-new-cobalt-lcd-framebuffer-driver-v3.patch
drivers-char-remove-old-broken-cobalt-lcd-driver.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
