Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05b8ccfb authored by Jacek Anaszewski's avatar Jacek Anaszewski
Browse files

ALSA: line6: Avoid polluting led_* namespace 



led_colors clashes with the array of the same name being added
to the LED class. Do the following amendments to fix this issue
and the other prospective one.

led_colors -> toneport_led_colors
led_init_vals -> toneport_led_init_vals

Fixes: f44edd7b ("ALSA: line6/toneport: Implement LED controls via LED class")
Signed-off-by: default avatarJacek Anaszewski <jacek.anaszewski@gmail.com>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 174c9526

sound/usb/line6/toneport.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -291,8 +291,8 @@ static bool toneport_has_led(struct usb_line6_toneport *toneport) 
	}

	}

}

}





static const char * const led_colors[2] = { "red", "green" };

static const char * const toneport_led_colors[2] = { "red", "green" };

static const int led_init_vals[2] = { 0x00, 0x26 };

static const int toneport_led_init_vals[2] = { 0x00, 0x26 };





static void toneport_update_led(struct usb_line6_toneport *toneport)

static void toneport_update_led(struct usb_line6_toneport *toneport)

{

{
@@ -320,9 +320,9 @@ static int toneport_init_leds(struct usb_line6_toneport *toneport) 




		led->toneport = toneport;

		led->toneport = toneport;

		snprintf(led->name, sizeof(led->name), "%s::%s",

		snprintf(led->name, sizeof(led->name), "%s::%s",

			 dev_name(dev), led_colors[i]);

			 dev_name(dev), toneport_led_colors[i]);

		leddev->name = led->name;

		leddev->name = led->name;

		leddev->brightness = led_init_vals[i];

		leddev->brightness = toneport_led_init_vals[i];

		leddev->max_brightness = 0x26;

		leddev->max_brightness = 0x26;

		leddev->brightness_set = toneport_led_brightness_set;

		leddev->brightness_set = toneport_led_brightness_set;

		err = led_classdev_register(dev, leddev);

		err = led_classdev_register(dev, leddev);