lkml.org 
[lkml]   [2011]   [Feb]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 3/6] cciss: Mask off error bits of c->busaddr in cmd_special_free when calling pci_free_consistent
    From
    Date
    From: Stephen M. Cameron <scameron@beardog.cce.hp.com>

    Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
    ---
    drivers/block/cciss.c | 6 +++---
    1 files changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
    index 2e832b0..03cead6 100644
    --- a/drivers/block/cciss.c
    +++ b/drivers/block/cciss.c
    @@ -193,7 +193,7 @@ static int __devinit cciss_find_cfg_addrs(struct pci_dev *pdev,
    u64 *cfg_offset);
    static int __devinit cciss_pci_find_memory_BAR(struct pci_dev *pdev,
    unsigned long *memory_bar);
    -
    +static inline u32 cciss_tag_discard_error_bits(ctlr_info_t *h, u32 tag);

    /* performant mode helper functions */
    static void calc_bucket_map(int *bucket, int num_buckets, int nsgs,
    @@ -973,8 +973,8 @@ static void cmd_special_free(ctlr_info_t *h, CommandList_struct *c)
    temp64.val32.upper = c->ErrDesc.Addr.upper;
    pci_free_consistent(h->pdev, sizeof(ErrorInfo_struct),
    c->err_info, (dma_addr_t) temp64.val);
    - pci_free_consistent(h->pdev, sizeof(CommandList_struct),
    - c, (dma_addr_t) c->busaddr);
    + pci_free_consistent(h->pdev, sizeof(CommandList_struct), c,
    + (dma_addr_t) cciss_tag_discard_error_bits(h, (u32) c->busaddr));
    }

    static inline ctlr_info_t *get_host(struct gendisk *disk)


    \
     
     \ /
      Last update: 2011-02-22 21:17    [W:5.130 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site