GNU Linux-libre 4.4-gnu1b erratum

diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c
index 2f03d6790484be20c8e2cd76f57b8cd53cc2f16f..7d2a49e696bc01fb55e96d5286cd9a994eaffd8a 100644 (file)
--- a/drivers/net/wireless/b43legacy/main.c
+++ b/drivers/net/wireless/b43legacy/main.c
@@ -1597,20 +1597,20 @@ static void b43legacy_request_firmware(struct work_struct *work)
 
        if (!fw->ucode) {
                if (rev == 2)
-                       filename = /*(DEBLOBBED)*/;
+                       filename = "/*(DEBLOBBED)*/";
                else if (rev == 4)
-                       filename = /*(DEBLOBBED)*/;
+                       filename = "/*(DEBLOBBED)*/";
                else
-                       filename = "ucode5";
+                       filename = "/*(DEBLOBBED)*/";
                err = do_request_fw(dev, filename, &fw->ucode, true);
                if (err)
                        goto err_load;
        }
        if (!fw->pcm) {
                if (rev < 5)
-                       filename = /*(DEBLOBBED)*/;
+                       filename = "/*(DEBLOBBED)*/";
                else
-                       filename = /*(DEBLOBBED)*/;
+                       filename = "/*(DEBLOBBED)*/";
                err = do_request_fw(dev, filename, &fw->pcm, false);
                if (err)
                        goto err_load;
@@ -1620,9 +1620,9 @@ static void b43legacy_request_firmware(struct work_struct *work)
                case B43legacy_PHYTYPE_B:
                case B43legacy_PHYTYPE_G:
                        if ((rev >= 5) && (rev <= 10))
-                               filename = "b0g0initvals5";
+                               filename = "/*(DEBLOBBED)*/";
                        else if (rev == 2 || rev == 4)
-                               filename = /*(DEBLOBBED)*/;
+                               filename = "/*(DEBLOBBED)*/";
                        else
                                goto err_no_initvals;
                        break;
@@ -1638,7 +1638,7 @@ static void b43legacy_request_firmware(struct work_struct *work)
                case B43legacy_PHYTYPE_B:
                case B43legacy_PHYTYPE_G:
                        if ((rev >= 5) && (rev <= 10))
-                               filename = "b0g0bsinitvals5";
+                               filename = "/*(DEBLOBBED)*/";
                        else if (rev >= 11)
                                filename = NULL;
                        else if (rev == 2 || rev == 4)