diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-05-20 08:38:55 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-05-20 08:38:55 -0400 |
| commit | dfacc4d6c98b89609250269f518c1f54c30454ef (patch) | |
| tree | e7effbee7bdc85d18f7b26ab9cb5c9f700d1481a /drivers/media/video/hexium_orion.c | |
| parent | f869097e884d8cb65b2bb7831ca57b7dffb66fdd (diff) | |
| parent | 85cb68b27c428d477169f3aa46c72dba103a17bd (diff) | |
Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/core
Diffstat (limited to 'drivers/media/video/hexium_orion.c')
| -rw-r--r-- | drivers/media/video/hexium_orion.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/media/video/hexium_orion.c b/drivers/media/video/hexium_orion.c index fe596a1c12a8..938a1f8f880a 100644 --- a/drivers/media/video/hexium_orion.c +++ b/drivers/media/video/hexium_orion.c | |||
| @@ -216,10 +216,6 @@ static int hexium_probe(struct saa7146_dev *dev) | |||
| 216 | return -EFAULT; | 216 | return -EFAULT; |
| 217 | } | 217 | } |
| 218 | 218 | ||
| 219 | err = saa7146_vv_devinit(dev); | ||
| 220 | if (err) | ||
| 221 | return err; | ||
| 222 | |||
| 223 | hexium = kzalloc(sizeof(struct hexium), GFP_KERNEL); | 219 | hexium = kzalloc(sizeof(struct hexium), GFP_KERNEL); |
| 224 | if (NULL == hexium) { | 220 | if (NULL == hexium) { |
| 225 | printk("hexium_orion: hexium_probe: not enough kernel memory.\n"); | 221 | printk("hexium_orion: hexium_probe: not enough kernel memory.\n"); |