From 88196c36e75b2f041a28ebacb612c9be93c1bd9c Mon Sep 17 00:00:00 2001
From: "Robert P. J. Day" <rpjday@mindspring.com>
Date: Wed, 2 May 2007 09:47:16 -0300
Subject: [PATCH] --- yaml --- r: 56063 b: refs/heads/master c:
 b3785596e3964656b9901f4eff73bf40b654d425 h: refs/heads/master i:   56061:
 e1ee0a8a00645dbd9a06bbb4604afd11e245c7cc   56059:
 8a58242b20732dc3a27d2b0d696aed5f3783c639   56055:
 e91cd55d93819abc4037cd0dbf0ab8c11b9af7b7   56047:
 d95cd3eb42801b581f6e0cae14d0a6aa020d4759   56031:
 5ea7256e3f59ffa2c90b65c805d66e84ce068424   55999:
 1b447affd6e63ef9eade9ca8e0780870c4237586   55935:
 a0b3bc37627f648ae1c16934e6adf67148acbf76   55807:
 d3f5cf87e89bd4929addd0b5f43027bdb2f09f06 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/media/video/ivtv/ivtv-fileops.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a7d4b690afb1..6f88127922c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53958b35e4f8fa14ebcc098018635b306db2bde1
+refs/heads/master: b3785596e3964656b9901f4eff73bf40b654d425
diff --git a/trunk/drivers/media/video/ivtv/ivtv-fileops.c b/trunk/drivers/media/video/ivtv/ivtv-fileops.c
index 1637097ddec7..8976487a65f3 100644
--- a/trunk/drivers/media/video/ivtv/ivtv-fileops.c
+++ b/trunk/drivers/media/video/ivtv/ivtv-fileops.c
@@ -804,7 +804,7 @@ int ivtv_v4l2_open(struct inode *inode, struct file *filp)
 	struct ivtv_open_id *item;
 	struct ivtv *itv = NULL;
 	struct ivtv_stream *s = NULL;
-	int minor = MINOR(inode->i_rdev);
+	int minor = iminor(inode);
 
 	/* Find which card this open was on */
 	spin_lock(&ivtv_cards_lock);