| ... | ... | ||
|---|---|---|---|
| 8 | 8 | ||
| 9 | Fixes: 554c0a3abf21 ("staging: Add rtl8723bs sdio wifi driver") | 9 | Fixes: 554c0a3abf21 ("staging: Add rtl8723bs sdio wifi driver") |
| 10 | Cc: stable@vger.kernel.org # v4.12+ | 10 | Cc: stable@vger.kernel.org # v4.12+ |
| 11 | Signed-off-by: Wentao Liang <vulab@iscas.ac.cn> | 11 | Signed-off-by: Wentao Liang <vulab@iscas.ac.cn> |
| 12 | --- | 12 | --- |
| 13 | v6: Fix improper code to propagate error code | ||
| 13 | v5: Fix error code | 14 | v5: Fix error code |
| 14 | v4: Add change log and fix error code | 15 | v4: Add change log and fix error code |
| 15 | v3: Add Cc flag | 16 | v3: Add Cc flag |
| 16 | v2: Change code to initialize val | 17 | v2: Change code to initialize val |
| 17 | 18 | ||
| ... | ... | ||
| 28 | ftaddr &= ~(u16)0x3; | 29 | ftaddr &= ~(u16)0x3; |
| 29 | - sd_read(intfhdl, ftaddr, 8, tmpbuf); | 30 | - sd_read(intfhdl, ftaddr, 8, tmpbuf); |
| 30 | + err = sd_read(intfhdl, ftaddr, 8, tmpbuf); | 31 | + err = sd_read(intfhdl, ftaddr, 8, tmpbuf); |
| 31 | + if (err) { | 32 | + if (err) { |
| 32 | + kfree(tmpbuf); | 33 | + kfree(tmpbuf); |
| 33 | + return SDIO_ERR_VAL32; | 34 | + return (u32)err; |
| 34 | + } | 35 | + } |
| 35 | + | 36 | + |
| 36 | memcpy(&le_tmp, tmpbuf + shift, 4); | 37 | memcpy(&le_tmp, tmpbuf + shift, 4); |
| 37 | val = le32_to_cpu(le_tmp); | 38 | val = le32_to_cpu(le_tmp); |
| 38 | 39 | ||
| 39 | -- | 40 | -- |
| 40 | 2.42.0.windows.2 | 41 | 2.42.0.windows.2 | diff view generated by jsdifflib |