From: Alexandre Oliva Date: Wed, 1 Sep 2021 03:32:29 +0000 (-0400) Subject: GNU Linux-libre 4.4.282-gnu1a erratum X-Git-Tag: sources/v4.4.282-gnu1a^0 X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=6e6f83ad1c160b53ac2c26aff6e8b458c06c7528;p=releases.git GNU Linux-libre 4.4.282-gnu1a erratum --- diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c index ffd46af0fba..a18a1580ac9 100644 --- a/drivers/net/wireless/b43legacy/main.c +++ b/drivers/net/wireless/b43legacy/main.c @@ -1598,20 +1598,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; @@ -1621,9 +1621,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; @@ -1639,7 +1639,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)