From d48defc5a82c2bc955d3c8c9a5a3c7ccea87d5d4 Mon Sep 17 00:00:00 2001 From: Hans Rosenfeld Date: Mon, 16 Oct 2017 16:06:50 +0200 Subject: 9793 vioblk attach doesn't always fail when it should Reviewed by: Robert Mustacchi Reviewed by: Patrick Mooney Reviewed by: Toomas Soome Reviewed by: Andy Fiddaman Approved by: Garrett D'Amore --- usr/src/uts/common/io/vioblk/vioblk.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'usr/src') diff --git a/usr/src/uts/common/io/vioblk/vioblk.c b/usr/src/uts/common/io/vioblk/vioblk.c index 141a3eddb6..aeabada516 100644 --- a/usr/src/uts/common/io/vioblk/vioblk.c +++ b/usr/src/uts/common/io/vioblk/vioblk.c @@ -22,6 +22,7 @@ /* * Copyright (c) 2015, Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2012, Alexey Zaytsev + * Copyright 2017, Joyent Inc. */ @@ -829,13 +830,11 @@ vioblk_attach(dev_info_t *devinfo, ddi_attach_cmd_t cmd) case DDI_RESUME: case DDI_PM_RESUME: dev_err(devinfo, CE_WARN, "resume not supported yet"); - ret = DDI_FAILURE; - goto exit; + return (DDI_FAILURE); default: dev_err(devinfo, CE_WARN, "cmd 0x%x not recognized", cmd); - ret = DDI_FAILURE; - goto exit; + return (DDI_FAILURE); } sc = kmem_zalloc(sizeof (struct vioblk_softc), KM_SLEEP); @@ -1029,8 +1028,7 @@ exit_intrstat: mutex_destroy(&sc->lock_devid); cv_destroy(&sc->cv_devid); kmem_free(sc, sizeof (struct vioblk_softc)); -exit: - return (ret); + return (DDI_FAILURE); } static int -- cgit v1.2.3