From: David Woodhouse <dwmw2@infradead.org>
Date: Fri, 23 May 2008 17:38:49 +0000 (+0100)
Subject: firmware: make fw->data const
X-Git-Tag: v2.6.27-rc1~1094^2^2~29
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b7a39bd0afc4021e8ad2b1189e884551e147427f;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 9fd4a853414..264b3a2cd86 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,
 	if (retval)
 		goto out;
 
-	memcpy(fw->data + offset, buffer, count);
+	memcpy((u8 *)fw->data + offset, buffer, count);
 
 	fw->size = max_t(size_t, offset + count, fw->size);
 	retval = count;
diff --git a/include/linux/firmware.h b/include/linux/firmware.h
index 6c7eff2ebad..88718d60153 100644
--- a/include/linux/firmware.h
+++ b/include/linux/firmware.h
@@ -8,7 +8,7 @@
 
 struct firmware {
 	size_t size;
-	u8 *data;
+	const u8 *data;
 };
 
 struct device;