From: Robert P. J. Day <rpjday@mindspring.com>
Date: Wed, 2 May 2007 12:47:16 +0000 (-0300)
Subject: V4L/DVB (5583): VIDEO4LINUX-2: Replace MINOR() with a call to iminor().
X-Git-Tag: v2.6.22-rc1~23^2~29
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3785596e3964656b9901f4eff73bf40b654d425;p=linux-2.6

V4L/DVB (5583): VIDEO4LINUX-2: Replace MINOR() with a call to iminor().

Replace the call to MINOR() with a call to the inline iminor()
routine.

Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>
Acked-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---

diff --git a/drivers/media/video/ivtv/ivtv-fileops.c b/drivers/media/video/ivtv/ivtv-fileops.c
index 1637097dde..8976487a65 100644
--- a/drivers/media/video/ivtv/ivtv-fileops.c
+++ b/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);