Merge branches 'at91', 'dyntick', 'ep93xx', 'iop', 'ixp', 'misc', 'orion', 'omap...

[linux-2.6] / drivers / media / video / saa7134 / saa7134-core.c

diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index 599273894f342a1e84a34ea0464bb3074accc4fa..2c19cd0113c8d2e1faa1b54493562b456a8ed3c4 100644 (file)
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -864,7 +864,9 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
        struct saa7134_dev *dev;
        struct saa7134_mpeg_ops *mops;
        int err;
-       int mask;
+
+       if (saa7134_devcount == SAA7134_MAXBOARDS)
+               return -ENOMEM;
 
        dev = kzalloc(sizeof(*dev),GFP_KERNEL);
        if (NULL == dev)
@@ -1062,11 +1064,6 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
        if (TUNER_ABSENT != dev->tuner_type)
                saa7134_i2c_call_clients(dev, TUNER_SET_STANDBY, NULL);
 
-       if (card(dev).gpiomask != 0) {
-               mask = card(dev).gpiomask;
-               saa_andorl(SAA7134_GPIO_GPMODE0 >> 2,   mask, mask);
-               saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, mask, 0);
-       }
        return 0;
 
  fail4: