Merge tag 'denywrite-for-5.15' of git://github.com/davidhildenbrand/linux

[linux-2.6-microblaze.git] / sound / usb / mixer_maps.c

diff --git a/sound/usb/mixer_maps.c b/sound/usb/mixer_maps.c
index c5794e8..55eea90 100644 (file)
--- a/sound/usb/mixer_maps.c
+++ b/sound/usb/mixer_maps.c
@@ -28,7 +28,6 @@ struct usbmix_ctl_map {
        const struct usbmix_name_map *map;
        const struct usbmix_selector_map *selector_map;
        const struct usbmix_connector_map *connector_map;
-       int ignore_ctl_error;
 };
 
 /*
@@ -432,7 +431,6 @@ static const struct usbmix_ctl_map usbmix_ctl_maps[] = {
        {
                .id = USB_ID(0x041e, 0x3000),
                .map = extigy_map,
-               .ignore_ctl_error = 1,
        },
        {
                .id = USB_ID(0x041e, 0x3010),
@@ -452,28 +450,10 @@ static const struct usbmix_ctl_map usbmix_ctl_maps[] = {
                .map = audigy2nx_map,
                .selector_map = audigy2nx_selectors,
        },
-       {       /* Logitech, Inc. QuickCam Pro for Notebooks */
-               .id = USB_ID(0x046d, 0x0991),
-               .ignore_ctl_error = 1,
-       },
-       {       /* Logitech, Inc. QuickCam E 3500 */
-               .id = USB_ID(0x046d, 0x09a4),
-               .ignore_ctl_error = 1,
-       },
        {       /* Plantronics GameCom 780 */
                .id = USB_ID(0x047f, 0xc010),
                .map = gamecom780_map,
        },
-       {
-               /* Hercules DJ Console (Windows Edition) */
-               .id = USB_ID(0x06f8, 0xb000),
-               .ignore_ctl_error = 1,
-       },
-       {
-               /* Hercules DJ Console (Macintosh Edition) */
-               .id = USB_ID(0x06f8, 0xd002),
-               .ignore_ctl_error = 1,
-       },
        {
                /* Hercules Gamesurround Muse Pocket LT
                 * (USB 5.1 Channel Audio Adapter)
@@ -492,7 +472,6 @@ static const struct usbmix_ctl_map usbmix_ctl_maps[] = {
        {
                .id = USB_ID(0x08bb, 0x2702),
                .map = linex_map,
-               .ignore_ctl_error = 1,
        },
        {
                .id = USB_ID(0x0a92, 0x0091),
@@ -517,7 +496,6 @@ static const struct usbmix_ctl_map usbmix_ctl_maps[] = {
        {
                .id = USB_ID(0x13e5, 0x0001),
                .map = scratch_live_map,
-               .ignore_ctl_error = 1,
        },
        {
                .id = USB_ID(0x200c, 0x1018),