aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2008-05-23 13:38:49 -0400
committerDavid Woodhouse <David.Woodhouse@intel.com>2008-07-10 09:29:25 -0400
commitb7a39bd0afc4021e8ad2b1189e884551e147427f (patch)
tree41d36cfe80aee9cb7013b86b6122b85b775c0843
parentfd4f80de4612cc5255c108a8c13df88f89c46654 (diff)
firmware: make fw->data const
In preparation for supporting firmware files linked into the static kernel, make fw->data const to ensure that users aren't modifying it (so that we can pass a pointer to the original in-kernel copy, rather than having to copy it). Signed-off-by: David Woodhouse <dwmw2@infradead.org>
-rw-r--r--drivers/base/firmware_class.c2
-rw-r--r--include/linux/firmware.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 9fd4a8534146..264b3a2cd860 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -257,7 +257,7 @@ firmware_data_write(struct kobject *kobj, struct bin_attribute *bin_attr,
257 if (retval) 257 if (retval)
258 goto out; 258 goto out;
259 259
260 memcpy(fw->data + offset, buffer, count); 260 memcpy((u8 *)fw->data + offset, buffer, count);
261 261
262 fw->size = max_t(size_t, offset + count, fw->size); 262 fw->size = max_t(size_t, offset + count, fw->size);
263 retval = count; 263 retval = count;
diff --git a/include/linux/firmware.h b/include/linux/firmware.h
index 6c7eff2ebada..88718d60153c 100644
--- a/include/linux/firmware.h
+++ b/include/linux/firmware.h
@@ -8,7 +8,7 @@
8 8
9struct firmware { 9struct firmware {
10 size_t size; 10 size_t size;
11 u8 *data; 11 const u8 *data;
12}; 12};
13 13
14struct device; 14struct device;