On Tue, Jun 30, 2020 at 6:46 AM Philippe Mathieu-Daudé <f4...@amsat.org> wrote: > > We don't need to check if sd->blk is set twice. > > Reviewed-by: Peter Maydell <peter.mayd...@linaro.org> > Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org>
Reviewed-by: Alistair Francis <alistair.fran...@wdc.com> Alistair > --- > hw/sd/sd.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/hw/sd/sd.c b/hw/sd/sd.c > index 304fa4143a..8ef6715665 100644 > --- a/hw/sd/sd.c > +++ b/hw/sd/sd.c > @@ -2154,12 +2154,12 @@ static void sd_realize(DeviceState *dev, Error **errp) > return; > } > > - if (sd->blk && blk_is_read_only(sd->blk)) { > - error_setg(errp, "Cannot use read-only drive as SD card"); > - return; > - } > - > if (sd->blk) { > + if (blk_is_read_only(sd->blk)) { > + error_setg(errp, "Cannot use read-only drive as SD card"); > + return; > + } > + > ret = blk_set_perm(sd->blk, BLK_PERM_CONSISTENT_READ | > BLK_PERM_WRITE, > BLK_PERM_ALL, errp); > if (ret < 0) { > -- > 2.21.3 > >