summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions/media/0003-technisat-usb2-led-rename.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/collateral-evolutions/media/0003-technisat-usb2-led-rename.patch')
-rw-r--r--patches/collateral-evolutions/media/0003-technisat-usb2-led-rename.patch83
1 files changed, 0 insertions, 83 deletions
diff --git a/patches/collateral-evolutions/media/0003-technisat-usb2-led-rename.patch b/patches/collateral-evolutions/media/0003-technisat-usb2-led-rename.patch
deleted file mode 100644
index 4732392b..00000000
--- a/patches/collateral-evolutions/media/0003-technisat-usb2-led-rename.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-This clashes with include/linux/leds.h namespace, fix this and
-also send this upstream eventually.
-
---- a/drivers/media/usb/dvb-usb/technisat-usb2.c
-+++ b/drivers/media/usb/dvb-usb/technisat-usb2.c
-@@ -214,10 +214,10 @@ static void technisat_usb2_frontend_rese
-
- /* LED control */
- enum technisat_usb2_led_state {
-- LED_OFF,
-- LED_BLINK,
-- LED_ON,
-- LED_UNDEFINED
-+ TECH_LED_OFF,
-+ TECH_LED_BLINK,
-+ TECH_LED_ON,
-+ TECH_LED_UNDEFINED
- };
-
- static int technisat_usb2_set_led(struct dvb_usb_device *d, int red, enum technisat_usb2_led_state state)
-@@ -229,14 +229,14 @@ static int technisat_usb2_set_led(struct
- 0
- };
-
-- if (disable_led_control && state != LED_OFF)
-+ if (disable_led_control && state != TECH_LED_OFF)
- return 0;
-
- switch (state) {
-- case LED_ON:
-+ case TECH_LED_ON:
- led[1] = 0x82;
- break;
-- case LED_BLINK:
-+ case TECH_LED_BLINK:
- led[1] = 0x82;
- if (red) {
- led[2] = 0x02;
-@@ -251,7 +251,7 @@ static int technisat_usb2_set_led(struct
- break;
-
- default:
-- case LED_OFF:
-+ case TECH_LED_OFF:
- led[1] = 0x80;
- break;
- }
-@@ -310,11 +310,11 @@ static void technisat_usb2_green_led_con
- goto schedule;
-
- if (ber > 1000)
-- technisat_usb2_set_led(state->dev, 0, LED_BLINK);
-+ technisat_usb2_set_led(state->dev, 0, TECH_LED_BLINK);
- else
-- technisat_usb2_set_led(state->dev, 0, LED_ON);
-+ technisat_usb2_set_led(state->dev, 0, TECH_LED_ON);
- } else
-- technisat_usb2_set_led(state->dev, 0, LED_OFF);
-+ technisat_usb2_set_led(state->dev, 0, TECH_LED_OFF);
- }
-
- schedule:
-@@ -365,9 +365,9 @@ static int technisat_usb2_power_ctrl(str
- return 0;
-
- /* green led is turned off in any case - will be turned on when tuning */
-- technisat_usb2_set_led(d, 0, LED_OFF);
-+ technisat_usb2_set_led(d, 0, TECH_LED_OFF);
- /* red led is turned on all the time */
-- technisat_usb2_set_led(d, 1, LED_ON);
-+ technisat_usb2_set_led(d, 1, TECH_LED_ON);
- return 0;
- }
-
-@@ -667,7 +667,7 @@ static int technisat_usb2_rc_query(struc
- return 0;
-
- if (!disable_led_control)
-- technisat_usb2_set_led(d, 1, LED_BLINK);
-+ technisat_usb2_set_led(d, 1, TECH_LED_BLINK);
-
- return 0;
- }