Merge branch 'master' into for-2.6.31

Conflicts:
	drivers/block/hd.c
	drivers/block/mg_disk.c

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/media/video/saa5246a.c b/drivers/media/video/saa5246a.c
index da47b2f05288..155804b061e9 100644
--- a/drivers/media/video/saa5246a.c
+++ b/drivers/media/video/saa5246a.c
@@ -1092,9 +1092,8 @@ static int saa5246a_probe(struct i2c_client *client,
         /* Register it */
         err = video_register_device(t->vdev, VFL_TYPE_VTX, -1);
         if (err < 0) {
-                kfree(t);
                 video_device_release(t->vdev);
-                t->vdev = NULL;
+                kfree(t);
                 return err;
         }
         return 0;