From 9e1a15376bce2fc7746145eb8ee78a3674658bc8 Mon Sep 17 00:00:00 2001 From: Josh Hunt Date: Sat, 9 Jun 2012 07:03:39 -0700 Subject: [PATCH] [SCSI] properly initialize atomic_t Initialize atomic_t scsi_host_next_hn and ioerr_cntas per the guidelines defined in Documentation/atomic_ops.txt Signed-off-by: Josh Hunt Signed-off-by: James Bottomley --- drivers/scsi/hosts.c | 2 +- drivers/scsi/sd.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c index a3a056a9db67..2b6a03de5787 100644 --- a/drivers/scsi/hosts.c +++ b/drivers/scsi/hosts.c @@ -42,7 +42,7 @@ #include "scsi_logging.h" -static atomic_t scsi_host_next_hn; /* host_no for next new host */ +static atomic_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */ static void scsi_host_cls_release(struct device *dev) diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 6f72b80121a0..6e26db11250a 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -2704,6 +2704,7 @@ static int sd_probe(struct device *dev) sdkp->disk = gd; sdkp->index = index; atomic_set(&sdkp->openers, 0); + atomic_set(&sdkp->device->ioerr_cnt, 0); if (!sdp->request_queue->rq_timeout) { if (sdp->type != TYPE_MOD) -- 2.20.1