diff --git a/[refs] b/[refs]
index f15910c1d9c3..2cc61233ca9d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 993efa7133985597eb48fb486c661010ab08b525
+refs/heads/master: 2fc580ffeb551066f769934e3a4717d721d0a559
diff --git a/trunk/drivers/media/video/tuner-xc2028.c b/trunk/drivers/media/video/tuner-xc2028.c
index 371e822fb4cc..c64eae2c7ec2 100644
--- a/trunk/drivers/media/video/tuner-xc2028.c
+++ b/trunk/drivers/media/video/tuner-xc2028.c
@@ -311,7 +311,7 @@ static int load_all_firmwares(struct dvb_frontend *fe)
 		id = le64_to_cpu(*(v4l2_std_id *) p);
 		p += sizeof(id);
 
-		size = le32_to_cpu(*(v4l2_std_id *) p);
+		size = le32_to_cpu(*(__u32 *) p);
 		p += sizeof(size);
 
 		if ((!size) || (size + p > endp)) {