From 4bb562554d2ef2abb066373860cb57ecc09fdfda Mon Sep 17 00:00:00 2001 From: Josh Hunt Date: Sat, 9 Jun 2012 07:03:39 -0700 Subject: [PATCH] --- yaml --- r: 316786 b: refs/heads/master c: 9e1a15376bce2fc7746145eb8ee78a3674658bc8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/hosts.c | 2 +- trunk/drivers/scsi/sd.c | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4af5f2f88792..5c769c5448d8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bb2c94a3a6ad37fe7d34f369295bcdf5387e264f +refs/heads/master: 9e1a15376bce2fc7746145eb8ee78a3674658bc8 diff --git a/trunk/drivers/scsi/hosts.c b/trunk/drivers/scsi/hosts.c index a3a056a9db67..2b6a03de5787 100644 --- a/trunk/drivers/scsi/hosts.c +++ b/trunk/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/trunk/drivers/scsi/sd.c b/trunk/drivers/scsi/sd.c index 6f72b80121a0..6e26db11250a 100644 --- a/trunk/drivers/scsi/sd.c +++ b/trunk/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)