diff -r 14f634f5b613 -r 0cee1fb7f0fd tool/CommandSiiWrite.cpp
--- a/tool/CommandSiiWrite.cpp	Thu Mar 11 15:03:52 2010 +0100
+++ b/tool/CommandSiiWrite.cpp	Thu Mar 11 15:17:25 2010 +0100
@@ -78,7 +78,6 @@
 
 void CommandSiiWrite::execute(const StringVector &args)
 {
-	MasterIndexList masterIndices;
     stringstream err;
     ec_ioctl_slave_sii_t data;
     ifstream file;
@@ -89,13 +88,6 @@
         throwInvalidUsageException(err);
     }
 
-	masterIndices = getMasterIndices();
-    if (masterIndices.size() != 1) {
-        err << getName() << " requires to select a single master!";
-        throwInvalidUsageException(err);
-    }
-    MasterDevice m(masterIndices.front());
-
     if (args[0] == "-") {
         loadSiiData(&data, cin);
     } else {
@@ -117,6 +109,7 @@
         }
     }
 
+    MasterDevice m(getSingleMasterIndex());
     try {
         m.open(MasterDevice::ReadWrite);
     } catch (MasterDeviceException &e) {