From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932272AbVKVFTn (ORCPT ); Tue, 22 Nov 2005 00:19:43 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932298AbVKVFTk (ORCPT ); Tue, 22 Nov 2005 00:19:40 -0500 Received: from atlrel9.hp.com ([156.153.255.214]:38080 "EHLO atlrel9.hp.com") by vger.kernel.org with ESMTP id S932281AbVKVFTW (ORCPT ); Tue, 22 Nov 2005 00:19:22 -0500 From: Matthew Wilcox To: Linus Torvalds , Andrew Morton Cc: Matthew Wilcox , Ingo Molnar , linux-kernel@vger.kernel.org, Greg Kroah-Hartman , linux-pci@atrey.karlin.mff.cuni.cz Subject: [PATCH 4/5] Initialise pci_dev->irq correctly Message-Id: Date: Tue, 22 Nov 2005 00:19:10 -0500 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org If the Interrupt Pin is 0, initialise the device's irq to NO_IRQ instead of leaving it unset. Signed-off-by: Matthew Wlcox --- drivers/pci/probe.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) applies-to: 3175f6d926ef8ff55ee1fd96364d5b3ed430fb38 4ec4e15bcdd7401cf1fb19ef1cd4f64eb064a4c7 diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index fce2cb2..652095c 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -571,9 +571,12 @@ static void pci_read_irq(struct pci_dev unsigned char irq; pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &irq); - if (irq) + if (irq) { pci_read_config_byte(dev, PCI_INTERRUPT_LINE, &irq); - dev->irq = irq; + dev->irq = irq; + } else { + dev->irq = NO_IRQ; + } } /** --- 0.99.8.GIT