Skip to content

Commit d99ef36

Browse files
author
Jeff Garzik
committed
Merge branch 'master' into upstream
2 parents bdad69b + 387e2b0 commit d99ef36

File tree

12 files changed

+47
-38
lines changed

12 files changed

+47
-38
lines changed

‎drivers/media/dvb/Kconfig

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,26 +22,26 @@ config DVB
2222
source "drivers/media/dvb/dvb-core/Kconfig"
2323

2424
comment "Supported SAA7146 based PCI Adapters"
25-
depends on DVB_CORE && PCI
25+
depends on DVB_CORE && PCI && I2C
2626
source "drivers/media/dvb/ttpci/Kconfig"
2727

2828
comment "Supported USB Adapters"
29-
depends on DVB_CORE && USB
29+
depends on DVB_CORE && USB && I2C
3030
source "drivers/media/dvb/dvb-usb/Kconfig"
3131
source "drivers/media/dvb/ttusb-budget/Kconfig"
3232
source "drivers/media/dvb/ttusb-dec/Kconfig"
3333
source "drivers/media/dvb/cinergyT2/Kconfig"
3434

3535
comment "Supported FlexCopII (B2C2) Adapters"
36-
depends on DVB_CORE && (PCI || USB)
36+
depends on DVB_CORE && (PCI || USB) && I2C
3737
source "drivers/media/dvb/b2c2/Kconfig"
3838

3939
comment "Supported BT878 Adapters"
40-
depends on DVB_CORE && PCI
40+
depends on DVB_CORE && PCI && I2C
4141
source "drivers/media/dvb/bt8xx/Kconfig"
4242

4343
comment "Supported Pluto2 Adapters"
44-
depends on DVB_CORE && PCI
44+
depends on DVB_CORE && PCI && I2C
4545
source "drivers/media/dvb/pluto2/Kconfig"
4646

4747
comment "Supported DVB Frontends"

‎drivers/media/dvb/b2c2/Kconfig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
config DVB_B2C2_FLEXCOP
22
tristate "Technisat/B2C2 FlexCopII(b) and FlexCopIII adapters"
3-
depends on DVB_CORE
3+
depends on DVB_CORE && I2C
44
select DVB_STV0299
55
select DVB_MT352
66
select DVB_MT312
@@ -16,15 +16,15 @@ config DVB_B2C2_FLEXCOP
1616

1717
config DVB_B2C2_FLEXCOP_PCI
1818
tristate "Technisat/B2C2 Air/Sky/Cable2PC PCI"
19-
depends on DVB_B2C2_FLEXCOP && PCI
19+
depends on DVB_B2C2_FLEXCOP && PCI && I2C
2020
help
2121
Support for the Air/Sky/CableStar2 PCI card (DVB/ATSC) by Technisat/B2C2.
2222

2323
Say Y if you own such a device and want to use it.
2424

2525
config DVB_B2C2_FLEXCOP_USB
2626
tristate "Technisat/B2C2 Air/Sky/Cable2PC USB"
27-
depends on DVB_B2C2_FLEXCOP && USB
27+
depends on DVB_B2C2_FLEXCOP && USB && I2C
2828
help
2929
Support for the Air/Sky/Cable2PC USB1.1 box (DVB/ATSC) by Technisat/B2C2,
3030

‎drivers/media/dvb/bt8xx/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
config DVB_BT8XX
22
tristate "BT8xx based PCI cards"
3-
depends on DVB_CORE && PCI && VIDEO_BT848
3+
depends on DVB_CORE && PCI && I2C && VIDEO_BT848
44
select DVB_MT352
55
select DVB_SP887X
66
select DVB_NXT6000

‎drivers/media/dvb/bt8xx/dvb-bt8xx.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ static int is_pci_slot_eq(struct pci_dev* adev, struct pci_dev* bdev)
115115
return 0;
116116
}
117117

118-
static struct bt878 __init *dvb_bt8xx_878_match(unsigned int bttv_nr, struct pci_dev* bttv_pci_dev)
118+
static struct bt878 __devinit *dvb_bt8xx_878_match(unsigned int bttv_nr, struct pci_dev* bttv_pci_dev)
119119
{
120120
unsigned int card_nr;
121121

@@ -709,7 +709,7 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type)
709709
}
710710
}
711711

712-
static int __init dvb_bt8xx_load_card(struct dvb_bt8xx_card *card, u32 type)
712+
static int __devinit dvb_bt8xx_load_card(struct dvb_bt8xx_card *card, u32 type)
713713
{
714714
int result;
715715

@@ -794,7 +794,7 @@ static int __init dvb_bt8xx_load_card(struct dvb_bt8xx_card *card, u32 type)
794794
return 0;
795795
}
796796

797-
static int dvb_bt8xx_probe(struct bttv_sub_device *sub)
797+
static int __devinit dvb_bt8xx_probe(struct bttv_sub_device *sub)
798798
{
799799
struct dvb_bt8xx_card *card;
800800
struct pci_dev* bttv_pci_dev;

‎drivers/media/dvb/dvb-usb/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
config DVB_USB
22
tristate "Support for various USB DVB devices"
3-
depends on DVB_CORE && USB
3+
depends on DVB_CORE && USB && I2C
44
select FW_LOADER
55
help
66
By enabling this you will be able to choose the various supported

‎drivers/media/dvb/pluto2/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
config DVB_PLUTO2
22
tristate "Pluto2 cards"
3-
depends on DVB_CORE && PCI
3+
depends on DVB_CORE && PCI && I2C
44
select I2C
55
select I2C_ALGOBIT
66
select DVB_TDA1004X

‎drivers/media/dvb/ttpci/Kconfig

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
config DVB_AV7110
22
tristate "AV7110 cards"
3-
depends on DVB_CORE && PCI && VIDEO_V4L1
3+
depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
44
select FW_LOADER
55
select VIDEO_SAA7146_VV
66
select DVB_VES1820
@@ -58,7 +58,7 @@ config DVB_AV7110_OSD
5858

5959
config DVB_BUDGET
6060
tristate "Budget cards"
61-
depends on DVB_CORE && PCI && VIDEO_V4L1
61+
depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
6262
select VIDEO_SAA7146
6363
select DVB_STV0299
6464
select DVB_VES1X93
@@ -79,7 +79,7 @@ config DVB_BUDGET
7979

8080
config DVB_BUDGET_CI
8181
tristate "Budget cards with onboard CI connector"
82-
depends on DVB_CORE && PCI && VIDEO_V4L1
82+
depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
8383
select VIDEO_SAA7146
8484
select DVB_STV0297
8585
select DVB_STV0299
@@ -99,7 +99,7 @@ config DVB_BUDGET_CI
9999

100100
config DVB_BUDGET_AV
101101
tristate "Budget cards with analog video inputs"
102-
depends on DVB_CORE && PCI && VIDEO_V4L1
102+
depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
103103
select VIDEO_SAA7146_VV
104104
select DVB_STV0299
105105
select DVB_TDA1004X

‎drivers/media/video/Kconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,15 +170,15 @@ config VIDEO_VINO
170170

171171
config VIDEO_STRADIS
172172
tristate "Stradis 4:2:2 MPEG-2 video driver (EXPERIMENTAL)"
173-
depends on EXPERIMENTAL && PCI && VIDEO_V4L1
173+
depends on EXPERIMENTAL && PCI && VIDEO_V4L1 && !PPC64
174174
help
175175
Say Y here to enable support for the Stradis 4:2:2 MPEG-2 video
176176
driver for PCI. There is a product page at
177177
<http://www.stradis.com/>.
178178

179179
config VIDEO_ZORAN
180180
tristate "Zoran ZR36057/36067 Video For Linux"
181-
depends on PCI && I2C_ALGOBIT && VIDEO_V4L1
181+
depends on PCI && I2C_ALGOBIT && VIDEO_V4L1 && !PPC64
182182
help
183183
Say Y for support for MJPEG capture cards based on the Zoran
184184
36057/36067 PCI controller chipset. This includes the Iomega

‎drivers/media/video/Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@ tuner-objs := tuner-core.o tuner-types.o tuner-simple.o \
1111
msp3400-objs := msp3400-driver.o msp3400-kthreads.o
1212

1313
obj-$(CONFIG_VIDEO_DEV) += videodev.o v4l2-common.o compat_ioctl32.o
14-
obj-$(CONFIG_VIDEO_V4L1_COMPAT) += v4l1-compat.o
14+
15+
ifeq ($(CONFIG_VIDEO_V4L1_COMPAT),y)
16+
obj-$(CONFIG_VIDEO_DEV) += v4l1-compat.o
17+
endif
1518

1619
obj-$(CONFIG_VIDEO_BT848) += bt8xx/
1720
obj-$(CONFIG_VIDEO_BT848) += tvaudio.o tda7432.o tda9875.o ir-kbd-i2c.o

‎net/bridge/br.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ static int __init br_init(void)
5555

5656
static void __exit br_deinit(void)
5757
{
58-
llc_sap_close(br_stp_sap);
58+
rcu_assign_pointer(br_stp_sap->rcv_func, NULL);
5959

6060
#ifdef CONFIG_BRIDGE_NETFILTER
6161
br_netfilter_fini();
@@ -67,6 +67,7 @@ static void __exit br_deinit(void)
6767

6868
synchronize_net();
6969

70+
llc_sap_put(br_stp_sap);
7071
br_fdb_get_hook = NULL;
7172
br_fdb_put_hook = NULL;
7273

‎net/ipv4/netfilter/ip_conntrack_helper_h323_asn1.c

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -528,14 +528,15 @@ int decode_seq(bitstr_t * bs, field_t * f, char *base, int level)
528528

529529
/* Decode */
530530
if ((err = (Decoders[son->type]) (bs, son, base,
531-
level + 1)) >
532-
H323_ERROR_STOP)
531+
level + 1)) <
532+
H323_ERROR_NONE)
533533
return err;
534534

535535
bs->cur = beg + len;
536536
bs->bit = 0;
537537
} else if ((err = (Decoders[son->type]) (bs, son, base,
538-
level + 1)))
538+
level + 1)) <
539+
H323_ERROR_NONE)
539540
return err;
540541
}
541542

@@ -554,7 +555,7 @@ int decode_seq(bitstr_t * bs, field_t * f, char *base, int level)
554555

555556
/* Decode the extension components */
556557
for (opt = 0; opt < bmp2_len; opt++, i++, son++) {
557-
if (son->attr & STOP) {
558+
if (i < f->ub && son->attr & STOP) {
558559
PRINT("%*.s%s\n", (level + 1) * TAB_SIZE, " ",
559560
son->name);
560561
return H323_ERROR_STOP;
@@ -584,8 +585,8 @@ int decode_seq(bitstr_t * bs, field_t * f, char *base, int level)
584585
beg = bs->cur;
585586

586587
if ((err = (Decoders[son->type]) (bs, son, base,
587-
level + 1)) >
588-
H323_ERROR_STOP)
588+
level + 1)) <
589+
H323_ERROR_NONE)
589590
return err;
590591

591592
bs->cur = beg + len;
@@ -660,18 +661,20 @@ int decode_seqof(bitstr_t * bs, field_t * f, char *base, int level)
660661
i <
661662
effective_count ?
662663
base : NULL,
663-
level + 1)) >
664-
H323_ERROR_STOP)
664+
level + 1)) <
665+
H323_ERROR_NONE)
665666
return err;
666667

667668
bs->cur = beg + len;
668669
bs->bit = 0;
669670
} else
670-
if ((err = (Decoders[son->type]) (bs, son,
671-
i < effective_count ?
672-
base : NULL,
673-
level + 1)))
674-
return err;
671+
if ((err = (Decoders[son->type]) (bs, son,
672+
i <
673+
effective_count ?
674+
base : NULL,
675+
level + 1)) <
676+
H323_ERROR_NONE)
677+
return err;
675678

676679
if (base)
677680
base += son->offset;
@@ -735,13 +738,14 @@ int decode_choice(bitstr_t * bs, field_t * f, char *base, int level)
735738
}
736739
beg = bs->cur;
737740

738-
if ((err = (Decoders[son->type]) (bs, son, base, level + 1)) >
739-
H323_ERROR_STOP)
741+
if ((err = (Decoders[son->type]) (bs, son, base, level + 1)) <
742+
H323_ERROR_NONE)
740743
return err;
741744

742745
bs->cur = beg + len;
743746
bs->bit = 0;
744-
} else if ((err = (Decoders[son->type]) (bs, son, base, level + 1)))
747+
} else if ((err = (Decoders[son->type]) (bs, son, base, level + 1)) <
748+
H323_ERROR_NONE)
745749
return err;
746750

747751
return H323_ERROR_NONE;

‎net/ipv4/netfilter/ip_nat_snmp_basic.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -768,6 +768,7 @@ static unsigned char snmp_object_decode(struct asn1_ctx *ctx,
768768
len *= sizeof(unsigned long);
769769
*obj = kmalloc(sizeof(struct snmp_object) + len, GFP_ATOMIC);
770770
if (*obj == NULL) {
771+
kfree(lp);
771772
kfree(id);
772773
if (net_ratelimit())
773774
printk("OOM in bsalg (%d)\n", __LINE__);

0 commit comments

Comments
 (0)