From 02dab491035cd38788228ab7881ec26a37c6fc8e Mon Sep 17 00:00:00 2001 From: Jason Self Date: Mon, 4 Feb 2019 18:23:37 -0800 Subject: [PATCH] deblob-4.16.14-gnu --- deblob-4.16 | 8 ++------ deblob-check | 8 +++++--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/deblob-4.16 b/deblob-4.16 index 1b3f623d8cc..dab4681b368 100755 --- 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-check b/deblob-check index b83786205e7..8f9c8ff0af0 100755 --- a/deblob-check +++ b/deblob-check @@ -1,6 +1,7 @@ #! /bin/sh -# deblob-check version 2018-03-25 +# deblob-check version 2018-03-25 + 2018-05-27's r15022 (partial) +# + 2018-06-05's r15066 # Inspired in gNewSense's find-firmware script. # Written by Alexandre Oliva @@ -1600,8 +1601,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 @@ -5026,6 +5025,9 @@ set_except () { accept '[\t]retval0[ ]=[ ]report_missing_free_firmware[^\n]*[\n][\t]retval[ ]=[ ]request_firmware_direct[(]' include/linux/firmware.h accept '[\t]retval0[ ]=[ ]report_missing_free_firmware[^\n]*[\n][\t]retval[ ]=[ ]request_firmware_into_buf[(][&]xfw[,][ ]NONFREE_FIRMWARE' include/linux/firmware.h + # Backported to 4.16.14-gnu + accept 'MODULE_FIRMWARE[(]["]aica_firmware\.bin["][)][;]' sound/sh/aica.c + accept '[\t]err[ ]=[ ]request_firmware[(][&]fw_entry[,][ ]["]aica_firmware\.bin["][,]' sound/sh/aica.c ;; */*freedo*.patch | */*logo*.patch) -- 2.31.1