diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-10-28 13:43:19 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-10-28 13:43:27 +1100 |
| commit | e12fdab4fb2bbe6e5283cfa201cf57994536d727 (patch) | |
| tree | 65bbba28c58d866ccd7f1e56b8d0457170dc9d15 /drivers/staging/rtl8192e/r8180_93cx6.c | |
| parent | 06c58c708f55d3d16709fbff5b60387f997c32ab (diff) | |
| parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
Merge remote branch 'staging-next/staging-next'
Conflicts:
arch/arm/plat-omap/devices.c
drivers/misc/Makefile
drivers/misc/ti-st/st_core.c
drivers/misc/ti-st/st_kim.c
drivers/staging/Makefile
drivers/staging/batman-adv/hard-interface.c
drivers/staging/cx25821/cx25821-audio-upstream.c
drivers/staging/cx25821/cx25821-audio.h
drivers/staging/mrst-touchscreen/Makefile
drivers/staging/mrst-touchscreen/intel-mid-touch.c
drivers/staging/ti-st/st.h
drivers/staging/ti-st/st_core.h
fs/compat_ioctl.c
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 262ed5fd086a..c38dd176987d 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) { |