summaryrefslogtreecommitdiffstats
path: root/patches/features/all/rt28x0sta-constify-RTUSBMultiWrite-RTUSBFirmwareWrite.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/features/all/rt28x0sta-constify-RTUSBMultiWrite-RTUSBFirmwareWrite.patch')
-rw-r--r--patches/features/all/rt28x0sta-constify-RTUSBMultiWrite-RTUSBFirmwareWrite.patch87
1 files changed, 87 insertions, 0 deletions
diff --git a/patches/features/all/rt28x0sta-constify-RTUSBMultiWrite-RTUSBFirmwareWrite.patch b/patches/features/all/rt28x0sta-constify-RTUSBMultiWrite-RTUSBFirmwareWrite.patch
new file mode 100644
index 0000000..1ff6caf
--- /dev/null
+++ b/patches/features/all/rt28x0sta-constify-RTUSBMultiWrite-RTUSBFirmwareWrite.patch
@@ -0,0 +1,87 @@
+From fb9c62c3bbf88aa3a3c9bb0c9feb26740eb29ddf Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben@decadent.org.uk>
+Date: Mon, 18 Jan 2010 02:50:24 +0000
+Subject: [PATCH] Staging: rt2870sta: constify RTUSBMultiWrite(), RTUSBFirmwareWrite()
+
+These functions do not modify the data they are passed.
+
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+---
+ drivers/staging/rt2860/rtmp.h | 6 +++---
+ drivers/staging/rt2870/common/rtusb_io.c | 10 +++++-----
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/drivers/staging/rt2860/rtmp.h b/drivers/staging/rt2860/rtmp.h
+index c50abf4..6c6503d 100644
+--- a/drivers/staging/rt2860/rtmp.h
++++ b/drivers/staging/rt2860/rtmp.h
+@@ -4043,10 +4043,10 @@ int RTUSBMultiRead(struct rt_rtmp_adapter *pAd,
+ u16 Offset, u8 *pData, u16 length);
+
+ int RTUSBMultiWrite(struct rt_rtmp_adapter *pAd,
+- u16 Offset, u8 *pData, u16 length);
++ u16 Offset, const u8 *pData, u16 length);
+
+ int RTUSBMultiWrite_OneByte(struct rt_rtmp_adapter *pAd,
+- u16 Offset, u8 *pData);
++ u16 Offset, const u8 *pData);
+
+ int RTUSBReadBBPRegister(struct rt_rtmp_adapter *pAd,
+ u8 Id, u8 *pValue);
+@@ -4112,7 +4112,7 @@ int RTUSBSingleWrite(struct rt_rtmp_adapter *pAd,
+ u16 Offset, u16 Value);
+
+ int RTUSBFirmwareWrite(struct rt_rtmp_adapter *pAd,
+- u8 *pFwImage, unsigned long FwLen);
++ const u8 *pFwImage, unsigned long FwLen);
+
+ int RTUSBVenderReset(struct rt_rtmp_adapter *pAd);
+
+diff --git a/drivers/staging/rt2870/common/rtusb_io.c b/drivers/staging/rt2870/common/rtusb_io.c
+index 34443f2..cf0d2f5 100644
+--- a/drivers/staging/rt2870/common/rtusb_io.c
++++ b/drivers/staging/rt2870/common/rtusb_io.c
+@@ -84,7 +84,7 @@ static int RTUSBFirmwareRun(struct rt_rtmp_adapter *pAd)
+ ========================================================================
+ */
+ int RTUSBFirmwareWrite(struct rt_rtmp_adapter *pAd,
+- u8 *pFwImage, unsigned long FwLen)
++ const u8 *pFwImage, unsigned long FwLen)
+ {
+ u32 MacReg;
+ int Status;
+@@ -167,7 +167,7 @@ int RTUSBMultiRead(struct rt_rtmp_adapter *pAd,
+ ========================================================================
+ */
+ int RTUSBMultiWrite_OneByte(struct rt_rtmp_adapter *pAd,
+- u16 Offset, u8 *pData)
++ u16 Offset, const u8 *pData)
+ {
+ int Status;
+
+@@ -175,18 +175,18 @@ int RTUSBMultiWrite_OneByte(struct rt_rtmp_adapter *pAd,
+ Status = RTUSB_VendorRequest(pAd,
+ USBD_TRANSFER_DIRECTION_OUT,
+ DEVICE_VENDOR_REQUEST_OUT,
+- 0x6, 0, Offset, pData, 1);
++ 0x6, 0, Offset, (u8 *)pData, 1);
+
+ return Status;
+ }
+
+ int RTUSBMultiWrite(struct rt_rtmp_adapter *pAd,
+- u16 Offset, u8 *pData, u16 length)
++ u16 Offset, const u8 *pData, u16 length)
+ {
+ int Status;
+
+ u16 index = 0, Value;
+- u8 *pSrc = pData;
++ const u8 *pSrc = pData;
+ u16 resude = 0;
+
+ resude = length % 2;
+--
+1.6.6.2
+