d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove two checks that are always false

Browse Source 
Outer loop condition contradicts inner check so code under inner condition
is not reachable. Remove it.

PR:		229722
Reported by:	David Binderman
This commit is contained in:
Oleksandr Tymoshenko 2018-07-16 01:07:28 +00:00
parent 697be9a3bd
commit e06262c163
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=336325
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/arm/broadcom/bcm2835/bcm2835_sdhost.c
View File

@ -1022,12 +1022,8 @@ bcm_sdhost_read_multi_4(device_t dev, struct sdhci_slot *slot, bus_size_t off,
for (i = 0; i < count;) {
edm = RD4(sc, HC_DEBUG);
avail = ((edm >> 4) & 0x1f);
if (i + avail > count) {
if (i >= count)
return;
else
avail = count - i;
}
if (i + avail > count)
avail = count - i;
if (avail > 0)
bus_space_read_multi_4(sc->sc_bst, sc->sc_bsh,
HC_DATAPORT, data + i, avail);
@ -1234,12 +1230,8 @@ bcm_sdhost_write_multi_4(device_t dev, struct sdhci_slot *slot,
for (i = 0; i < count;) {
edm = RD4(sc, HC_DEBUG);
space = HC_FIFO_SIZE - ((edm >> 4) & 0x1f);
if (i + space > count) {
if (i >= count)
return;
else
space = count - i;
}
if (i + space > count)
space = count - i;
if (space > 0)
bus_space_write_multi_4(sc->sc_bst, sc->sc_bsh,
HC_DATAPORT, data + i, space);