From d9c0e1d018b9c7222874ed3f6eaf249cbfbdff0a Mon Sep 17 00:00:00 2001
From: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date: Sun, 17 Feb 2008 14:56:19 +0100
Subject: [PATCH] --- yaml --- r: 86369 b: refs/heads/master c:
 5513c5f6f9bd8c8ad3727130910fa288c62526a7 h: refs/heads/master i:   86367:
 651298cefa2273b956effc46b5f44b1e910ea8bf v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/firewire/fw-sbp2.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 123a8a3caeaa..7fd39b5ac85c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e2705bdcb959372d54bf7f79dd9a555ec2adfb4
+refs/heads/master: 5513c5f6f9bd8c8ad3727130910fa288c62526a7
diff --git a/trunk/drivers/firewire/fw-sbp2.c b/trunk/drivers/firewire/fw-sbp2.c
index ea4811c45512..60ebcb5fe21a 100644
--- a/trunk/drivers/firewire/fw-sbp2.c
+++ b/trunk/drivers/firewire/fw-sbp2.c
@@ -1473,6 +1473,10 @@ static int sbp2_scsi_slave_alloc(struct scsi_device *sdev)
 {
 	struct sbp2_logical_unit *lu = sdev->hostdata;
 
+	/* (Re-)Adding logical units via the SCSI stack is not supported. */
+	if (!lu)
+		return -ENOSYS;
+
 	sdev->allow_restart = 1;
 
 	/*