From: Thierry Vignaud <tvignaud@mandriva.com>

fix compiling USB DVB drivers (at least with gcc-4):

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>

8 files changed, 11 insertions, 11 deletions

diff --git a/linux/drivers/media/dvb/dvb-usb/a800.c b/linux/drivers/media/dvb/dvb-usb/a800.c
index 9e8526c2d..a35429356 100644
--- a/linux/drivers/media/dvb/dvb-usb/a800.c
+++ b/linux/drivers/media/dvb/dvb-usb/a800.c
@@ -125,7 +125,7 @@ static struct dvb_usb_properties a800_properties = {
 		.type = DVB_USB_BULK,
 		.count = 7,
 		.endpoint = 0x06,
-		.u {
+		.u = {
 			.bulk = {
 				.buffersize = 4096,
 			}
diff --git a/linux/drivers/media/dvb/dvb-usb/dibusb-mb.c b/linux/drivers/media/dvb/dvb-usb/dibusb-mb.c
index a94a768fa..aee6263f0 100644
--- a/linux/drivers/media/dvb/dvb-usb/dibusb-mb.c
+++ b/linux/drivers/media/dvb/dvb-usb/dibusb-mb.c
@@ -163,7 +163,7 @@ static struct dvb_usb_properties dibusb1_1_properties = {
 		.type = DVB_USB_BULK,
 		.count = 7,
 		.endpoint = 0x02,
-		.u {
+		.u = {
 			.bulk = {
 				.buffersize = 4096,
 			}
@@ -235,7 +235,7 @@ static struct dvb_usb_properties dibusb1_1_an2235_properties = {
 		.type = DVB_USB_BULK,
 		.count = 7,
 		.endpoint = 0x02,
-		.u {
+		.u = {
 			.bulk = {
 				.buffersize = 4096,
 			}
@@ -289,7 +289,7 @@ static struct dvb_usb_properties dibusb2_0b_properties = {
 		.type = DVB_USB_BULK,
 		.count = 7,
 		.endpoint = 0x06,
-		.u {
+		.u = {
 			.bulk = {
 				.buffersize = 4096,
 			}
diff --git a/linux/drivers/media/dvb/dvb-usb/dibusb-mc.c b/linux/drivers/media/dvb/dvb-usb/dibusb-mc.c
index 88f22df74..aad8ed3fe 100644
--- a/linux/drivers/media/dvb/dvb-usb/dibusb-mc.c
+++ b/linux/drivers/media/dvb/dvb-usb/dibusb-mc.c
@@ -61,7 +61,7 @@ static struct dvb_usb_properties dibusb_mc_properties = {
 		.type = DVB_USB_BULK,
 		.count = 7,
 		.endpoint = 0x06,
-		.u {
+		.u = {
 			.bulk = {
 				.buffersize = 4096,
 			}
diff --git a/linux/drivers/media/dvb/dvb-usb/digitv.c b/linux/drivers/media/dvb/dvb-usb/digitv.c
index 1457675ed..4bb79ec22 100644
--- a/linux/drivers/media/dvb/dvb-usb/digitv.c
+++ b/linux/drivers/media/dvb/dvb-usb/digitv.c
@@ -33,7 +33,7 @@ static int digitv_ctrl_msg(struct dvb_usb_device *d,
 	sndbuf[1] = vv;
 	sndbuf[2] = wo ? wlen : rlen;
 
-	if (!wo) {
+	if (wo) {
 		memcpy(&sndbuf[3],wbuf,wlen);
 		dvb_usb_generic_write(d,sndbuf,7);
 	} else {
@@ -244,7 +244,7 @@ static struct dvb_usb_properties digitv_properties = {
 		.type = DVB_USB_BULK,
 		.count = 7,
 		.endpoint = 0x02,
-		.u {
+		.u = {
 			.bulk = {
 				.buffersize = 4096,
 			}
diff --git a/linux/drivers/media/dvb/dvb-usb/dtt200u.c b/linux/drivers/media/dvb/dvb-usb/dtt200u.c
index b68985c79..fb2b5a2da 100644
--- a/linux/drivers/media/dvb/dvb-usb/dtt200u.c
+++ b/linux/drivers/media/dvb/dvb-usb/dtt200u.c
@@ -118,7 +118,7 @@ static struct dvb_usb_properties dtt200u_properties = {
 		.type = DVB_USB_BULK,
 		.count = 7,
 		.endpoint = 0x02,
-		.u {
+		.u = {
 			.bulk = {
 				.buffersize = 4096,
 			}
diff --git a/linux/drivers/media/dvb/dvb-usb/nova-t-usb2.c b/linux/drivers/media/dvb/dvb-usb/nova-t-usb2.c
index 8f4c20496..9d83781ae 100644
--- a/linux/drivers/media/dvb/dvb-usb/nova-t-usb2.c
+++ b/linux/drivers/media/dvb/dvb-usb/nova-t-usb2.c
@@ -185,7 +185,7 @@ static struct dvb_usb_properties nova_t_properties = {
 		.type = DVB_USB_BULK,
 		.count = 7,
 		.endpoint = 0x06,
-		.u {
+		.u = {
 			.bulk = {
 				.buffersize = 4096,
 			}
diff --git a/linux/drivers/media/dvb/dvb-usb/umt-010.c b/linux/drivers/media/dvb/dvb-usb/umt-010.c
index d9f0ce68a..aa560422c 100644
--- a/linux/drivers/media/dvb/dvb-usb/umt-010.c
+++ b/linux/drivers/media/dvb/dvb-usb/umt-010.c
@@ -111,7 +111,7 @@ static struct dvb_usb_properties umt_properties = {
 		.type = DVB_USB_BULK,
 		.count = 20,
 		.endpoint = 0x06,
-		.u {
+		.u = {
 			.bulk = {
 				.buffersize = 512,
 			}
diff --git a/linux/drivers/media/dvb/dvb-usb/vp7045.c b/linux/drivers/media/dvb/dvb-usb/vp7045.c
index 2820a8df2..02ecc9a8e 100644
--- a/linux/drivers/media/dvb/dvb-usb/vp7045.c
+++ b/linux/drivers/media/dvb/dvb-usb/vp7045.c
@@ -206,7 +206,7 @@ static struct dvb_usb_properties vp7045_properties = {
 		.type = DVB_USB_BULK,
 		.count = 7,
 		.endpoint = 0x02,
-		.u {
+		.u = {
 			.bulk = {
 				.buffersize = 4096,
 			}