mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb 

* 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
  V4L/DVB (6070): Fix a warning at dvb_net
  V4L/DVB (6042): b2c2-flexcop: fix Airstar HD5000 tuning regression
This commit is contained in:
Linus Torvalds 2007-08-23 21:38:54 -07:00
parent d0797b39dc 04b35abef7
commit 87bd1e9aaf
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/media/dvb/b2c2/flexcop-i2c.c
View File

@ -135,6 +135,13 @@ static int flexcop_master_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msgs
struct flexcop_device *fc = i2c_get_adapdata(i2c_adap);
int i, ret = 0;
/* Some drivers use 1 byte or 0 byte reads as probes, which this
* driver doesn't support. These probes will always fail, so this
* hack makes them always succeed. If one knew how, it would of
* course be better to actually do the read. */
if (num == 1 && msgs[0].flags == I2C_M_RD && msgs[0].len <= 1)
return 1;
if (mutex_lock_interruptible(&fc->i2c_mutex))
return -ERESTARTSYS;

5
drivers/media/dvb/dvb-core/dvb_net.c
View File

@ -800,7 +800,8 @@ static int dvb_net_ts_callback(const u8 *buffer1, size_t buffer1_len,
}
static void dvb_net_sec(struct net_device *dev, u8 *pkt, int pkt_len)
static void dvb_net_sec(struct net_device *dev, const u8 *pkt, int
pkt_len)
{
u8 *eth;
struct sk_buff *skb;
@ -902,7 +903,7 @@ static int dvb_net_sec_callback(const u8 *buffer1, size_t buffer1_len,
* we rely on the DVB API definition where exactly one complete
* section is delivered in buffer1
*/
dvb_net_sec (dev, (u8*) buffer1, buffer1_len);
dvb_net_sec (dev, buffer1, buffer1_len);
return 0;
}