Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / media / video / pvrusb2 / pvrusb2-sysfs.c

diff --git a/drivers/media/video/pvrusb2/pvrusb2-sysfs.c b/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
index 3d7e5aab547fdf0c15e680c5e26aa8d98e46eaa5..281806b2df6263cf901594fc5cb8dec817d54c5e 100644 (file)
--- a/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
@@ -647,7 +647,7 @@ static void class_dev_create(struct pvr2_sysfs *sfp,
        if (ret) {
                pvr2_trace(PVR2_TRACE_ERROR_LEGS,
                           "device_register failed");
-               kfree(class_dev);
+               put_device(class_dev);
                return;
        }