From: "Stephen M. Cameron" <scameron@beardog.cce.hp.com>
To: axboe@kernel.dk
Cc: mikem@beardog.cce.hp.com, akpm@linux-foundation.org,
thenzl@redhat.com, linux-kernel@vger.kernel.org,
smcameron@yahoo.com
Subject: [PATCH 3/6] cciss: Mask off error bits of c->busaddr in cmd_special_free when calling pci_free_consistent
Date: Tue, 22 Feb 2011 14:14:26 -0600 [thread overview]
Message-ID: <20110222201426.21961.97588.stgit@beardog.cce.hp.com> (raw)
In-Reply-To: <20110222201025.21961.82560.stgit@beardog.cce.hp.com>
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)
next prev parent reply other threads:[~2011-02-22 20:14 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-22 20:14 [PATCH 0/6] cciss: Feb 22, 2010 updates Stephen M. Cameron
2011-02-22 20:14 ` [PATCH 1/6] cciss: host tag masking out of loop Stephen M. Cameron
2011-02-22 20:14 ` [PATCH 2/6] cciss: Inform controller we are using 32-bit tags Stephen M. Cameron
2011-02-22 20:14 ` Stephen M. Cameron [this message]
2011-02-23 8:43 ` [PATCH 3/6] cciss: Mask off error bits of c->busaddr in cmd_special_free when calling pci_free_consistent Jack Stone
2011-02-22 20:14 ` [PATCH 4/6] cciss: remove unnecessary casts Stephen M. Cameron
2011-02-22 20:14 ` [PATCH 5/6] cciss: fix missed command status value CMD_UNABORTABLE Stephen M. Cameron
2011-02-22 20:14 ` [PATCH 6/6] cciss: add cciss_tape_cmds module paramter Stephen M. Cameron
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110222201426.21961.97588.stgit@beardog.cce.hp.com \
--to=scameron@beardog.cce.hp.com \
--cc=akpm@linux-foundation.org \
--cc=axboe@kernel.dk \
--cc=linux-kernel@vger.kernel.org \
--cc=mikem@beardog.cce.hp.com \
--cc=smcameron@yahoo.com \
--cc=thenzl@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox