Merge branch 'akpm' (fixes from Andrew Morton)

[firefly-linux-kernel-4.4.55.git] / drivers / scsi / sr.c

diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index 7eeb93627beb77f31d00eeb147fc4e44ef6331c5..2de44cc58b1acd5cf038fd1a40ace6f34810b276 100644 (file)
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -657,6 +657,7 @@ static int sr_probe(struct device *dev)
        struct scsi_cd *cd;
        int minor, error;
 
+       scsi_autopm_get_device(sdev);
        error = -ENODEV;
        if (sdev->type != TYPE_ROM && sdev->type != TYPE_WORM)
                goto fail;
@@ -744,6 +745,7 @@ fail_put:
 fail_free:
        kfree(cd);
 fail:
+       scsi_autopm_put_device(sdev);
        return error;
 }