Fix request_firmware_nowait bug introduced in 4.16-gnu. Backport SND_AICA non-deblob...

git-svn-id: http://www.fsfla.org/svn/fsfla/software/linux-libre/scripts@15066 559672b5-ba27-0410-b829-e8f1faed8b1b

diff --git a/deblob-4.16 b/deblob-4.16
index 1b3f623d8cca9afbd1bcc23833aadb1083df3fd2..dab4681b36850b54a1850ce9a6d20bf91aab5460 100755 (executable)
--- a/deblob-4.16
+++ b/deblob-4.16
@@ -501,7 +501,7 @@ reject_firmware_nowait(struct module *module, int uevent,\
        report_missing_free_firmware(dev_name(device), NULL);\
        /* We assume NONFREE_FIRMWARE will not be found; how could it?  */\
        return request_firmware_nowait(module, uevent, NONFREE_FIRMWARE,\
-                                      device, gfp, NULL, cont);\
+                                      device, gfp, context, cont);\
 }\
 static inline int\
 maybe_reject_firmware_nowait(struct module *module, int uevent,\
@@ -3132,11 +3132,7 @@ clean_blob sound/pci/rme9652/hdsp.c
 clean_kconfig sound/pci/Kconfig SND_HDSP
 clean_mk CONFIG_SND_HDSP sound/pci/rme9652/Makefile
 
-announce SND_AICA - "Dreamcast Yamaha AICA sound"
-reject_firmware sound/sh/aica.c
-clean_blob sound/sh/aica.c
-clean_kconfig sound/sh/Kconfig SND_AICA
-clean_mk CONFIG_SND_AICA sound/sh/Makefile
+# SND_AICA is no longer disabled, its firmware is Free Software.
 
 announce SND_MSND_PINNACLE - "Support for Turtle Beach MultiSound Pinnacle"
 clean_blob sound/isa/msnd/msnd_pinnacle.h

diff --git a/deblob-4.17 b/deblob-4.17
index 5da4f2009d675373589b9d7df5c08de680caf059..e821d51c0cea1130d737b2f7e9cc668af5bac358 100755 (executable)
--- a/deblob-4.17
+++ b/deblob-4.17
@@ -505,7 +505,7 @@ reject_firmware_nowait(struct module *module, int uevent,\
        report_missing_free_firmware(dev_name(device), NULL);\
        /* We assume NONFREE_FIRMWARE will not be found; how could it?  */\
        return request_firmware_nowait(module, uevent, NONFREE_FIRMWARE,\
-                                      device, gfp, NULL, cont);\
+                                      device, gfp, context, cont);\
 }\
 static inline int\
 maybe_reject_firmware_nowait(struct module *module, int uevent,\

diff --git a/deblob-check b/deblob-check
index 961f514bb921b4e58668e80d40fd0565b0bc62d5..4307cf1edfad8778bf9588a6cd2df5e787c5e1c6 100755 (executable)
--- a/deblob-check
+++ b/deblob-check
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# deblob-check version 2018-05-27
+# deblob-check version 2018-06-05
 # Inspired in gNewSense's find-firmware script.
 # Written by Alexandre Oliva <lxoliva@fsfla.org>
 
@@ -1600,8 +1600,6 @@ set_except () {
 
     blobname '\(multi\|digi\)face_firmware\(_rev11\)\?\.bin' sound/pci/rme9652/hdsp.c
 
-    blobname 'aica_firmware\.bin' sound/sh/aica.c
-
     accept '[ ][*][^*]*\([*]\+[^/*][^*]*\)*[*]*Caution:[ ]This[ ]API[^*]*\([*]\+[^/*][^*]*\)*[*]*request_firmware.' sound/sound_firmware.c
     accept 'static[ ]int[ ]do_mod_firmware_load[(]' sound/sound_firmware.c
     accept 'int[ ]mod_firmware_load[(]' sound/sound_firmware.c