What reason is there for having two different fixes for the same bug? This one isn't going to get into any mainline trees that don't already have c9a4cb204e9e.
I believe this is the right thing to do, so usb_find_alt_setting() is not called with a known-bad argument.
Honestly, I would change "if (!config)" in usb_find_alt_setting() to "BUG_ON(!config)" so we know when its callers do smth wrong and go fix callers. Unfortunately, I understand this hardly will be accepted.
Best regards, Vladis Dronov | Red Hat, Inc. | Product Security Engineer