diff --git a/[refs] b/[refs]
index aaba1b00d7a5..aea0ccffdd59 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2add5f4661ce822fe16afabf925a0133d6b274fb
+refs/heads/master: 0ab1900539d46a3a8b7a006819ef5ec0e3288e5b
diff --git a/trunk/drivers/staging/slicoss/slicoss.c b/trunk/drivers/staging/slicoss/slicoss.c
index a511a2be9c70..785e4c5f269e 100644
--- a/trunk/drivers/staging/slicoss/slicoss.c
+++ b/trunk/drivers/staging/slicoss/slicoss.c
@@ -3745,8 +3745,7 @@ static u32 slic_card_locate(struct adapter *adapter)
 		rdhostid_offset = SLIC_RDHOSTID_1GB;
 		break;
 	default:
-		ASSERT(0);
-		break;
+		return -ENODEV;
 	}
 
 	hostid_reg =