diff options
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/cyclades.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c index ef73e72daedc..6bff9d87dc57 100644 --- a/drivers/char/cyclades.c +++ b/drivers/char/cyclades.c | |||
@@ -4668,7 +4668,7 @@ static inline int __devinit cyc_isfwstr(const char *str, unsigned int size) | |||
4668 | return 0; | 4668 | return 0; |
4669 | } | 4669 | } |
4670 | 4670 | ||
4671 | static inline void __devinit cyz_fpga_copy(void __iomem *fpga, u8 *data, | 4671 | static inline void __devinit cyz_fpga_copy(void __iomem *fpga, const u8 *data, |
4672 | unsigned int size) | 4672 | unsigned int size) |
4673 | { | 4673 | { |
4674 | for (; size > 0; size--) { | 4674 | for (; size > 0; size--) { |
@@ -4701,10 +4701,10 @@ static int __devinit __cyz_load_fw(const struct firmware *fw, | |||
4701 | const char *name, const u32 mailbox, void __iomem *base, | 4701 | const char *name, const u32 mailbox, void __iomem *base, |
4702 | void __iomem *fpga) | 4702 | void __iomem *fpga) |
4703 | { | 4703 | { |
4704 | void *ptr = fw->data; | 4704 | const void *ptr = fw->data; |
4705 | struct zfile_header *h = ptr; | 4705 | const struct zfile_header *h = ptr; |
4706 | struct zfile_config *c, *cs; | 4706 | const struct zfile_config *c, *cs; |
4707 | struct zfile_block *b, *bs; | 4707 | const struct zfile_block *b, *bs; |
4708 | unsigned int a, tmp, len = fw->size; | 4708 | unsigned int a, tmp, len = fw->size; |
4709 | #define BAD_FW KERN_ERR "Bad firmware: " | 4709 | #define BAD_FW KERN_ERR "Bad firmware: " |
4710 | if (len < sizeof(*h)) { | 4710 | if (len < sizeof(*h)) { |