lkml.org 
[lkml]   [2011]   [Nov]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 4/6] [SCSI] sd: check runtime PM status in sd_shutdown
    Date
    sd_shutdown is called during reboot/poweroff.
    It may fail if parent device, for example, ata port, was runtime suspended.

    Fix it by checking runtime PM status of sd.
    Exit immediately if sd was runtime suspended already.

    Signed-off-by: Lin Ming <ming.m.lin@intel.com>
    ---
    drivers/scsi/sd.c | 5 +++++
    1 files changed, 5 insertions(+), 0 deletions(-)

    diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
    index fa3a591..7b3f807 100644
    --- a/drivers/scsi/sd.c
    +++ b/drivers/scsi/sd.c
    @@ -50,6 +50,7 @@
    #include <linux/string_helpers.h>
    #include <linux/async.h>
    #include <linux/slab.h>
    +#include <linux/pm_runtime.h>
    #include <asm/uaccess.h>
    #include <asm/unaligned.h>

    @@ -2741,6 +2742,9 @@ static void sd_shutdown(struct device *dev)
    if (!sdkp)
    return; /* this can happen */

    + if (pm_runtime_suspended(dev))
    + goto exit;
    +
    if (sdkp->WCE) {
    sd_printk(KERN_NOTICE, sdkp, "Synchronizing SCSI cache\n");
    sd_sync_cache(sdkp);
    @@ -2751,6 +2755,7 @@ static void sd_shutdown(struct device *dev)
    sd_start_stop_device(sdkp, 0);
    }

    +exit:
    scsi_disk_put(sdkp);
    }

    --
    1.7.2.5


    \
     
     \ /
      Last update: 2011-11-28 02:19    [W:0.023 / U:0.052 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site