X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=tools%2Flib%2Fcarlfw.c;h=ce61afb244913f1c892a878d5f6b90ac60bc287a;hb=8d4c0cbe2efec53965a6a9e24df1688abb268184;hp=44897e39ef8ee07a1c0b464a1cc7857f303bb854;hpb=f2e3ff4fb3fc8c2f1d6678014a49b048f1e3beaf;p=carl9170fw.git

diff --git a/tools/lib/carlfw.c b/tools/lib/carlfw.c
index 44897e3..ce61afb 100644
--- a/tools/lib/carlfw.c
+++ b/tools/lib/carlfw.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010, Christian Lamparter <chunkeey@googlemail.com>
+ * Copyright 2010-2011 Christian Lamparter <chunkeey@googlemail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -409,19 +409,10 @@ struct carlfw *carlfw_load(const char *basename)
 
 	init_list_head(&fw->desc_list);
 
-	snprintf(filename, sizeof(filename), "%s.dsc", basename);
-	err = __carlfw_load(&fw->hdr, filename, "r");
-
-	snprintf(filename, sizeof(filename), "%s.fw", basename);
-	err = __carlfw_load(&fw->fw, filename, "r");
-	if (!err)
-		goto found;
-
 	err = __carlfw_load(&fw->fw, basename, "r");
 	if (err)
 		goto err_out;
 
-found:
 	if (fw->hdr.name)
 		hdr_file = &fw->hdr;
 	else