tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+7
drivers/media/dvb/b2c2/flexcop-i2c.c
+7
drivers/media/dvb/b2c2/flexcop-i2c.c
···
135
135
struct flexcop_device *fc = i2c_get_adapdata(i2c_adap);
136
136
int i, ret = 0;
137
137
138
+
/* Some drivers use 1 byte or 0 byte reads as probes, which this
139
+
* driver doesn't support. These probes will always fail, so this
140
+
* hack makes them always succeed. If one knew how, it would of
141
+
* course be better to actually do the read. */
142
+
if (num == 1 && msgs[0].flags == I2C_M_RD && msgs[0].len <= 1)
143
+
return 1;
144
+
138
145
if (mutex_lock_interruptible(&fc->i2c_mutex))
139
146
return -ERESTARTSYS;
140
147
+3
-2
drivers/media/dvb/dvb-core/dvb_net.c
+3
-2
drivers/media/dvb/dvb-core/dvb_net.c
···
800
800
}
801
801
802
802
803
-
static void dvb_net_sec(struct net_device *dev, u8 *pkt, int pkt_len)
803
+
static void dvb_net_sec(struct net_device *dev, const u8 *pkt, int
804
+
pkt_len)
804
805
{
805
806
u8 *eth;
806
807
struct sk_buff *skb;
···
903
902
* we rely on the DVB API definition where exactly one complete
904
903
* section is delivered in buffer1
905
904
*/
906
-
dvb_net_sec (dev, (u8*) buffer1, buffer1_len);
905
+
dvb_net_sec (dev, buffer1, buffer1_len);
907
906
return 0;
908
907
}
909
908