drivers/block/cciss.c |   19 +++++++++----------
 1 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 9bf1398..ec69f0c 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -619,22 +619,21 @@ static ssize_t dev_show_unique_id(struct device *dev,
 	int ret = 0;
 
 	spin_lock_irqsave(&h->lock, flags);
+	memcpy(sn, drv->serial_no, sizeof(sn));
 	if (h->busy_configuring)
 		ret = -EBUSY;
-	else
-		memcpy(sn, drv->serial_no, sizeof(sn));
 	spin_unlock_irqrestore(&h->lock, flags);
 
 	if (ret)
 		return ret;
-	else
-		return snprintf(buf, 16 * 2 + 2,
-				"%02X%02X%02X%02X%02X%02X%02X%02X"
-				"%02X%02X%02X%02X%02X%02X%02X%02X\n",
-				sn[0], sn[1], sn[2], sn[3],
-				sn[4], sn[5], sn[6], sn[7],
-				sn[8], sn[9], sn[10], sn[11],
-				sn[12], sn[13], sn[14], sn[15]);
+
+	return snprintf(buf, 16 * 2 + 2,
+			"%02X%02X%02X%02X%02X%02X%02X%02X"
+			"%02X%02X%02X%02X%02X%02X%02X%02X\n",
+			sn[0], sn[1], sn[2], sn[3],
+			sn[4], sn[5], sn[6], sn[7],
+			sn[8], sn[9], sn[10], sn[11],
+			sn[12], sn[13], sn[14], sn[15]);
 }
 static DEVICE_ATTR(unique_id, S_IRUGO, dev_show_unique_id, NULL);