Merge tag 'media/v4.8-6' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[cascardo/linux.git] / drivers / rapidio / switches / idt_gen2.c

diff --git a/drivers/rapidio/switches/idt_gen2.c b/drivers/rapidio/switches/idt_gen2.c
index 9f7fe21..e67b923 100644 (file)
--- a/drivers/rapidio/switches/idt_gen2.c
+++ b/drivers/rapidio/switches/idt_gen2.c
@@ -436,10 +436,11 @@ static int idtg2_probe(struct rio_dev *rdev, const struct rio_device_id *id)
                                    RIO_STD_RTE_DEFAULT_PORT, IDT_NO_ROUTE);
        }
 
+       spin_unlock(&rdev->rswitch->lock);
+
        /* Create device-specific sysfs attributes */
        idtg2_sysfs(rdev, true);
 
-       spin_unlock(&rdev->rswitch->lock);
        return 0;
 }
 
@@ -452,11 +453,9 @@ static void idtg2_remove(struct rio_dev *rdev)
                return;
        }
        rdev->rswitch->ops = NULL;
-
+       spin_unlock(&rdev->rswitch->lock);
        /* Remove device-specific sysfs attributes */
        idtg2_sysfs(rdev, false);
-
-       spin_unlock(&rdev->rswitch->lock);
 }
 
 static struct rio_device_id idtg2_id_table[] = {