Skip to content

Commit

Permalink
edac: fix local pci_write_bits32
Browse files Browse the repository at this point in the history
Fix the edac local pci_write_bits32 to properly note the 'escape' mask if
all ones in a 32-bit word.

Currently no consumer of this function uses that mask, so there is no
danger to existing code.

Signed-off-by: Jeff Haran <jharan@Brocade.COM>
Signed-off-by: Doug Thompson <dougthompson@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Jeff Haran authored and Linus Torvalds committed Apr 13, 2009
1 parent a7665b0 commit e6da46b
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions drivers/edac/edac_core.h
Original file line number Diff line number Diff line change
Expand Up @@ -767,11 +767,19 @@ static inline void pci_write_bits16(struct pci_dev *pdev, int offset,
pci_write_config_word(pdev, offset, value);
}

/* write all or some bits in a dword-register*/
/*
* pci_write_bits32
*
* edac local routine to do pci_write_config_dword, but adds
* a mask parameter. If mask is all ones, ignore the mask.
* Otherwise utilize the mask to isolate specified bits
*
* write all or some bits in a dword-register
*/
static inline void pci_write_bits32(struct pci_dev *pdev, int offset,
u32 value, u32 mask)
{
if (mask != 0xffff) {
if (mask != 0xffffffff) {
u32 buf;

pci_read_config_dword(pdev, offset, &buf);
Expand Down

0 comments on commit e6da46b

Please sign in to comment.