From: Mauro Carvalho Chehab - digitv_ctrl_msg() if (wo) test is reversed. fixed. - usb timeout is in Hz, not in jiffies. - NULL replaced by 0 to be coherent. - removed uneeded headers. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Andrew Morton --- drivers/media/dvb/b2c2/flexcop-reg.h | 4 +++- drivers/media/dvb/dvb-usb/digitv.c | 2 +- drivers/media/dvb/dvb-usb/dtt200u.c | 4 ++-- drivers/media/dvb/dvb-usb/dvb-usb-firmware.c | 2 +- drivers/media/dvb/dvb-usb/dvb-usb.h | 1 - drivers/media/dvb/dvb-usb/vp7045.c | 2 +- drivers/media/dvb/frontends/cx24110.c | 1 - drivers/media/dvb/frontends/lgdt330x.c | 2 ++ 8 files changed, 10 insertions(+), 8 deletions(-) diff -puN drivers/media/dvb/b2c2/flexcop-reg.h~v4l-dvb-3145-syncronizes-some-changes-between-v4l drivers/media/dvb/b2c2/flexcop-reg.h --- devel/drivers/media/dvb/b2c2/flexcop-reg.h~v4l-dvb-3145-syncronizes-some-changes-between-v4l 2005-12-09 22:51:36.000000000 -0800 +++ devel-akpm/drivers/media/dvb/b2c2/flexcop-reg.h 2005-12-09 22:51:36.000000000 -0800 @@ -39,11 +39,13 @@ extern const char *flexcop_device_names[ /* FlexCop IBI Registers */ #if defined(__LITTLE_ENDIAN) #include "flexcop_ibi_value_le.h" -#elif defined(__BIG_ENDIAN) +#else +#if defined(__BIG_ENDIAN) #include "flexcop_ibi_value_be.h" #else #error no endian defined #endif +#endif #define fc_data_Tag_ID_DVB 0x3e #define fc_data_Tag_ID_ATSC 0x3f diff -puN drivers/media/dvb/dvb-usb/digitv.c~v4l-dvb-3145-syncronizes-some-changes-between-v4l drivers/media/dvb/dvb-usb/digitv.c --- devel/drivers/media/dvb/dvb-usb/digitv.c~v4l-dvb-3145-syncronizes-some-changes-between-v4l 2005-12-09 22:51:36.000000000 -0800 +++ devel-akpm/drivers/media/dvb/dvb-usb/digitv.c 2005-12-09 22:51:36.000000000 -0800 @@ -32,7 +32,7 @@ static int digitv_ctrl_msg(struct dvb_us 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 { diff -puN drivers/media/dvb/dvb-usb/dtt200u.c~v4l-dvb-3145-syncronizes-some-changes-between-v4l drivers/media/dvb/dvb-usb/dtt200u.c --- devel/drivers/media/dvb/dvb-usb/dtt200u.c~v4l-dvb-3145-syncronizes-some-changes-between-v4l 2005-12-09 22:51:36.000000000 -0800 +++ devel-akpm/drivers/media/dvb/dvb-usb/dtt200u.c 2005-12-09 22:51:36.000000000 -0800 @@ -151,7 +151,7 @@ static struct dvb_usb_properties dtt200u .cold_ids = { &dtt200u_usb_table[0], NULL }, .warm_ids = { &dtt200u_usb_table[1], NULL }, }, - { NULL }, + { 0 }, } }; @@ -192,7 +192,7 @@ static struct dvb_usb_properties wt220u_ .cold_ids = { &dtt200u_usb_table[2], NULL }, .warm_ids = { &dtt200u_usb_table[3], NULL }, }, - { NULL }, + { 0 }, } }; diff -puN drivers/media/dvb/dvb-usb/dvb-usb-firmware.c~v4l-dvb-3145-syncronizes-some-changes-between-v4l drivers/media/dvb/dvb-usb/dvb-usb-firmware.c --- devel/drivers/media/dvb/dvb-usb/dvb-usb-firmware.c~v4l-dvb-3145-syncronizes-some-changes-between-v4l 2005-12-09 22:51:36.000000000 -0800 +++ devel-akpm/drivers/media/dvb/dvb-usb/dvb-usb-firmware.c 2005-12-09 22:51:36.000000000 -0800 @@ -30,7 +30,7 @@ static struct usb_cypress_controller cyp static int usb_cypress_writemem(struct usb_device *udev,u16 addr,u8 *data, u8 len) { return usb_control_msg(udev, usb_sndctrlpipe(udev,0), - 0xa0, USB_TYPE_VENDOR, addr, 0x00, data, len, 5*HZ); + 0xa0, USB_TYPE_VENDOR, addr, 0x00, data, len, 5000); } static int usb_cypress_load_firmware(struct usb_device *udev, const struct firmware *fw, int type) diff -puN drivers/media/dvb/dvb-usb/dvb-usb.h~v4l-dvb-3145-syncronizes-some-changes-between-v4l drivers/media/dvb/dvb-usb/dvb-usb.h --- devel/drivers/media/dvb/dvb-usb/dvb-usb.h~v4l-dvb-3145-syncronizes-some-changes-between-v4l 2005-12-09 22:51:36.000000000 -0800 +++ devel-akpm/drivers/media/dvb/dvb-usb/dvb-usb.h 2005-12-09 22:51:36.000000000 -0800 @@ -10,7 +10,6 @@ #include #include -#include #include #include diff -puN drivers/media/dvb/dvb-usb/vp7045.c~v4l-dvb-3145-syncronizes-some-changes-between-v4l drivers/media/dvb/dvb-usb/vp7045.c --- devel/drivers/media/dvb/dvb-usb/vp7045.c~v4l-dvb-3145-syncronizes-some-changes-between-v4l 2005-12-09 22:51:36.000000000 -0800 +++ devel-akpm/drivers/media/dvb/dvb-usb/vp7045.c 2005-12-09 22:51:36.000000000 -0800 @@ -247,7 +247,7 @@ static struct dvb_usb_properties vp7045_ .cold_ids = { &vp7045_usb_table[2], NULL }, .warm_ids = { &vp7045_usb_table[3], NULL }, }, - { NULL }, + { 0 }, } }; diff -puN drivers/media/dvb/frontends/cx24110.c~v4l-dvb-3145-syncronizes-some-changes-between-v4l drivers/media/dvb/frontends/cx24110.c --- devel/drivers/media/dvb/frontends/cx24110.c~v4l-dvb-3145-syncronizes-some-changes-between-v4l 2005-12-09 22:51:36.000000000 -0800 +++ devel-akpm/drivers/media/dvb/frontends/cx24110.c 2005-12-09 22:51:36.000000000 -0800 @@ -27,7 +27,6 @@ #include #include #include -#include #include "dvb_frontend.h" #include "cx24110.h" diff -puN drivers/media/dvb/frontends/lgdt330x.c~v4l-dvb-3145-syncronizes-some-changes-between-v4l drivers/media/dvb/frontends/lgdt330x.c --- devel/drivers/media/dvb/frontends/lgdt330x.c~v4l-dvb-3145-syncronizes-some-changes-between-v4l 2005-12-09 22:51:36.000000000 -0800 +++ devel-akpm/drivers/media/dvb/frontends/lgdt330x.c 2005-12-09 22:51:36.000000000 -0800 @@ -402,6 +402,8 @@ static int lgdt330x_set_parameters(struc state->config->pll_set(fe, param); /* Keep track of the new frequency */ + /* FIXME this is the wrong way to do this... */ + /* The tuner is shared with the video4linux analog API */ state->current_frequency = param->frequency; lgdt330x_SwReset(state); _