lkml.org 
[lkml]   [2008]   [May]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCHv2 25/28] firmware: make fw->data const
    Date
    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>
    ---
    drivers/base/firmware_class.c | 2 +-
    include/linux/firmware.h | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
    index 9fd4a85..264b3a2 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 4d10c73..5e73f3f 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;
    --
    1.5.4.5


    \
     
     \ /
      Last update: 2008-05-25 12:35    [W:0.040 / U:91.948 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site