aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ieee1394/dv1394.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ieee1394/dv1394.c')
-rw-r--r--drivers/ieee1394/dv1394.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c
index 823a6297a1af..2cd00b5b45b4 100644
--- a/drivers/ieee1394/dv1394.c
+++ b/drivers/ieee1394/dv1394.c
@@ -1789,12 +1789,13 @@ static int dv1394_open(struct inode *inode, struct file *file)
1789 } else { 1789 } else {
1790 /* look up the card by ID */ 1790 /* look up the card by ID */
1791 unsigned long flags; 1791 unsigned long flags;
1792 int idx = ieee1394_file_to_instance(file);
1792 1793
1793 spin_lock_irqsave(&dv1394_cards_lock, flags); 1794 spin_lock_irqsave(&dv1394_cards_lock, flags);
1794 if (!list_empty(&dv1394_cards)) { 1795 if (!list_empty(&dv1394_cards)) {
1795 struct video_card *p; 1796 struct video_card *p;
1796 list_for_each_entry(p, &dv1394_cards, list) { 1797 list_for_each_entry(p, &dv1394_cards, list) {
1797 if ((p->id) == ieee1394_file_to_instance(file)) { 1798 if ((p->id) == idx) {
1798 video = p; 1799 video = p;
1799 break; 1800 break;
1800 } 1801 }
@@ -1803,7 +1804,7 @@ static int dv1394_open(struct inode *inode, struct file *file)
1803 spin_unlock_irqrestore(&dv1394_cards_lock, flags); 1804 spin_unlock_irqrestore(&dv1394_cards_lock, flags);
1804 1805
1805 if (!video) { 1806 if (!video) {
1806 debug_printk("dv1394: OHCI card %d not found", ieee1394_file_to_instance(file)); 1807 debug_printk("dv1394: OHCI card %d not found", idx);
1807 return -ENODEV; 1808 return -ENODEV;
1808 } 1809 }
1809 1810