Merge branch 'for-linus' to bring in change ensuring that drivers that

[pandora-kernel.git] / drivers / gpu / drm / radeon / radeon_cp.c

diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c
index 0ebb7d4..ef67e18 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_cp.c
+++ b/drivers/gpu/drm/radeon/radeon_cp.c
@@ -1827,14 +1827,10 @@ void radeon_do_release(struct drm_device * dev)
                        r600_do_cleanup_cp(dev);
                else
                        radeon_do_cleanup_cp(dev);
-               if (dev_priv->me_fw) {
-                       release_firmware(dev_priv->me_fw);
-                       dev_priv->me_fw = NULL;
-               }
-               if (dev_priv->pfp_fw) {
-                       release_firmware(dev_priv->pfp_fw);
-                       dev_priv->pfp_fw = NULL;
-               }
+               release_firmware(dev_priv->me_fw);
+               dev_priv->me_fw = NULL;
+               release_firmware(dev_priv->pfp_fw);
+               dev_priv->pfp_fw = NULL;
        }
 }