diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /drivers/staging/rtl8192e/r8180_93cx6.c | |
parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
download | op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.zip op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.gz |
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8192e/r8180_93cx6.c')
-rw-r--r-- | drivers/staging/rtl8192e/r8180_93cx6.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/staging/rtl8192e/r8180_93cx6.c b/drivers/staging/rtl8192e/r8180_93cx6.c index 262ed5f..c38dd17 100644 --- a/drivers/staging/rtl8192e/r8180_93cx6.c +++ b/drivers/staging/rtl8192e/r8180_93cx6.c @@ -24,13 +24,12 @@ static void eprom_cs(struct net_device *dev, short bit) { if (bit) write_nic_byte(dev, EPROM_CMD, - (1<<EPROM_CS_SHIFT) | \ + (1<<EPROM_CS_SHIFT) | read_nic_byte(dev, EPROM_CMD)); //enable EPROM else - write_nic_byte(dev, EPROM_CMD, read_nic_byte(dev, EPROM_CMD)\ + write_nic_byte(dev, EPROM_CMD, read_nic_byte(dev, EPROM_CMD) &~(1<<EPROM_CS_SHIFT)); //disable EPROM - force_pci_posting(dev); udelay(EPROM_DELAY); } @@ -39,11 +38,9 @@ static void eprom_ck_cycle(struct net_device *dev) { write_nic_byte(dev, EPROM_CMD, (1<<EPROM_CK_SHIFT) | read_nic_byte(dev, EPROM_CMD)); - force_pci_posting(dev); udelay(EPROM_DELAY); write_nic_byte(dev, EPROM_CMD, read_nic_byte(dev, EPROM_CMD) & ~(1<<EPROM_CK_SHIFT)); - force_pci_posting(dev); udelay(EPROM_DELAY); } @@ -51,13 +48,12 @@ static void eprom_ck_cycle(struct net_device *dev) static void eprom_w(struct net_device *dev, short bit) { if (bit) - write_nic_byte(dev, EPROM_CMD, (1<<EPROM_W_SHIFT) | \ + write_nic_byte(dev, EPROM_CMD, (1<<EPROM_W_SHIFT) | read_nic_byte(dev, EPROM_CMD)); else - write_nic_byte(dev, EPROM_CMD, read_nic_byte(dev, EPROM_CMD)\ + write_nic_byte(dev, EPROM_CMD, read_nic_byte(dev, EPROM_CMD) &~(1<<EPROM_W_SHIFT)); - force_pci_posting(dev); udelay(EPROM_DELAY); } @@ -99,7 +95,6 @@ u32 eprom_read(struct net_device *dev, u32 addr) //enable EPROM programming write_nic_byte(dev, EPROM_CMD, (EPROM_CMD_PROGRAM<<EPROM_CMD_OPERATING_MODE_SHIFT)); - force_pci_posting(dev); udelay(EPROM_DELAY); if (priv->epromtype == EPROM_93c56) { |