diff options
| author | Tom Rini <trini@konsulko.com> | 2017-09-02 20:50:59 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-09-02 20:50:59 -0400 |
| commit | 41a85fe3b926385816e1958e2e4a521cae79921e (patch) | |
| tree | c05a2ad341c991c58fbaf1496487158255e66fe5 /drivers | |
| parent | e3f24d4f2c4ce48f666ef6098e166521dde6f688 (diff) | |
| parent | f04034cba4c2351da5b54ae36f5a30e3ccfce1cc (diff) | |
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/spi/ich.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/spi/ich.c b/drivers/spi/ich.c index 373bc2683b..22fc83dd72 100644 --- a/drivers/spi/ich.c +++ b/drivers/spi/ich.c @@ -468,8 +468,6 @@ static int ich_spi_xfer(struct udevice *dev, unsigned int bitlen, } /* Preset control fields */ - control = ich_readw(ctlr, ctlr->control); - control &= ~SSFC_RESERVED; control = SPIC_SCGO | ((opcode_index & 0x07) << 4); /* Issue atomic preop cycle if needed */ @@ -565,7 +563,8 @@ static int ich_spi_xfer(struct udevice *dev, unsigned int bitlen, } /* Clear atomic preop now that xfer is done */ - ich_writew(ctlr, 0, ctlr->preop); + if (!lock) + ich_writew(ctlr, 0, ctlr->preop); return 0; } |