From 9350f1bbbf96e70ac06225e99c1525324ba7f815 Mon Sep 17 00:00:00 2001 From: Florin Malita Date: Sat, 13 Oct 2007 11:49:52 -0300 Subject: [PATCH] --- yaml --- r: 72025 b: refs/heads/master c: fcf94c89af8acccb14ce37b1c9e8dd6bd32a999d h: refs/heads/master i: 72023: 018453a9118c011ffcd28d11bf007d66bf23b907 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx23885/cx23885-core.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 9da00f7d589b..dd9f26a17d20 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a13625c518ca6fd3ff7cb3b66d8023f843a745a3 +refs/heads/master: fcf94c89af8acccb14ce37b1c9e8dd6bd32a999d diff --git a/trunk/drivers/media/video/cx23885/cx23885-core.c b/trunk/drivers/media/video/cx23885/cx23885-core.c index af16505bd2e0..3cdd136477e5 100644 --- a/trunk/drivers/media/video/cx23885/cx23885-core.c +++ b/trunk/drivers/media/video/cx23885/cx23885-core.c @@ -793,7 +793,7 @@ static int cx23885_dev_setup(struct cx23885_dev *dev) dev->pci->subsystem_device); cx23885_devcount--; - goto fail_free; + return -ENODEV; } /* PCIe stuff */ @@ -835,10 +835,6 @@ static int cx23885_dev_setup(struct cx23885_dev *dev) } return 0; - -fail_free: - kfree(dev); - return -ENODEV; } void cx23885_dev_unregister(struct cx23885_dev *dev)