From 31e072620498e7e42226e2c840e14ebb8cfb06ea Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Wed, 21 Sep 2011 10:16:24 +0300 Subject: [PATCH] --- yaml --- r: 271327 b: refs/heads/master c: 261e767628bb5971b9032439818237cc8511ea94 h: refs/heads/master i: 271325: ae16385eb92868fcc3fde769e4b8fd0b87dc31bd 271323: 97059b7c83dcbb63d41c21d50cc092bbce9f6dec 271319: 3581a6e53fade252b13ed19113a863ab552c081b 271311: 7bea63c0610dd51fcc0f87d61e66bd9a46126f01 271295: ce27f1eff41d60a184b7d3c0795e17b0a3150d64 v: v3 --- [refs] | 2 +- trunk/drivers/video/smscufx.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index f67e64609aaa..abad1cf20a5d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2b7a905dd0d24d14a1099653ba63b7113a82fc54 +refs/heads/master: 261e767628bb5971b9032439818237cc8511ea94 diff --git a/trunk/drivers/video/smscufx.c b/trunk/drivers/video/smscufx.c index 44c8cab31a01..aaccffac67ab 100644 --- a/trunk/drivers/video/smscufx.c +++ b/trunk/drivers/video/smscufx.c @@ -103,7 +103,7 @@ struct ufx_data { struct delayed_work free_framebuffer_work; atomic_t usb_active; /* 0 = update virtual buffer, but no usb traffic */ atomic_t lost_pixels; /* 1 = a render op failed. Need screen refresh */ - char *edid; /* null until we read edid from hw or get from sysfs */ + u8 *edid; /* null until we read edid from hw or get from sysfs */ size_t edid_size; u32 pseudo_palette[256]; }; @@ -993,7 +993,7 @@ static int ufx_ops_ioctl(struct fb_info *info, unsigned int cmd, /* TODO: Update X server to get this from sysfs instead */ if (cmd == UFX_IOCTL_RETURN_EDID) { - char *edid = (char *)arg; + u8 __user *edid = (u8 __user *)arg; if (copy_to_user(edid, dev->edid, dev->edid_size)) return -EFAULT; return 0; @@ -1428,7 +1428,7 @@ static int ufx_i2c_wait_busy(struct ufx_data *dev) } /* reads a 128-byte EDID block from the currently selected port and TAR */ -static int ufx_read_edid(struct ufx_data *dev, char *edid, int edid_len) +static int ufx_read_edid(struct ufx_data *dev, u8 *edid, int edid_len) { int i, j, status; u32 *edid_u32 = (u32 *)edid; @@ -1491,7 +1491,7 @@ static int ufx_setup_modes(struct ufx_data *dev, struct fb_info *info, char *default_edid, size_t default_edid_size) { const struct fb_videomode *default_vmode = NULL; - char *edid; + u8 *edid; int i, result = 0, tries = 3; if (info->dev) /* only use mutex if info has been registered */