aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew de Quincey <adq_dvb@lidskialf.net>2006-04-06 09:37:56 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-06-25 00:57:52 -0400
commitdcdda65fd5e70a698dd3d7e65762e178290284b7 (patch)
tree32a1249838e7b93861b3d2f0d70813e9c9f4b9ab
parent0dbbc0a7ce1acc3a20857f25aa656bf2f5925766 (diff)
V4L/DVB (3741): Budget-core doesn't check if register adapter fails
If you have more than DVB_MAX_ADAPTERS in your machine, this causes an oops. Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--drivers/media/dvb/ttpci/budget-core.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/dvb/ttpci/budget-core.c b/drivers/media/dvb/ttpci/budget-core.c
index ea2066d461fc..d8af690fa55c 100644
--- a/drivers/media/dvb/ttpci/budget-core.c
+++ b/drivers/media/dvb/ttpci/budget-core.c
@@ -400,7 +400,9 @@ int ttpci_budget_init(struct budget *budget, struct saa7146_dev *dev,
400 budget->dev->name, budget->buffer_width, budget->buffer_height); 400 budget->dev->name, budget->buffer_width, budget->buffer_height);
401 printk("%s: dma buffer size %u\n", budget->dev->name, budget->buffer_size); 401 printk("%s: dma buffer size %u\n", budget->dev->name, budget->buffer_size);
402 402
403 dvb_register_adapter(&budget->dvb_adapter, budget->card->name, owner); 403 if ((ret = dvb_register_adapter(&budget->dvb_adapter, budget->card->name, owner)) < 0) {
404 return ret;
405 }
404 406
405 /* set dd1 stream a & b */ 407 /* set dd1 stream a & b */
406 saa7146_write(dev, DD1_STREAM_B, 0x00000000); 408 saa7146_write(dev, DD1_STREAM_B, 0x00000000);