Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

[linux-2.6-block.git] / drivers / gpu / drm / udl / udl_main.c

diff --git a/drivers/gpu/drm/udl/udl_main.c b/drivers/gpu/drm/udl/udl_main.c
index e1038a945f40c6d34ed0aa1635678b3d5c9ac087..7094b92d1ec78467b1600d6ec2e3fd8f080d1344 100644 (file)
--- a/drivers/gpu/drm/udl/udl_main.c
+++ b/drivers/gpu/drm/udl/udl_main.c
@@ -283,7 +283,7 @@ int udl_submit_urb(struct drm_device *dev, struct urb *urb, size_t len)
 int udl_driver_load(struct drm_device *dev, unsigned long flags)
 {
        struct udl_device *udl;
-       int ret;
+       int ret = -ENOMEM;
 
        DRM_DEBUG("\n");
        udl = kzalloc(sizeof(struct udl_device), GFP_KERNEL);
@@ -300,7 +300,6 @@ int udl_driver_load(struct drm_device *dev, unsigned long flags)
        }
 
        if (!udl_alloc_urb_list(dev, WRITES_IN_FLIGHT, MAX_TRANSFER)) {
-               ret = -ENOMEM;
                DRM_ERROR("udl_alloc_urb_list failed\n");
                goto err;
        }