From 2791c1f9bd5453af95d069c1a9acdbaca0a61940 Mon Sep 17 00:00:00 2001 From: Mike Miller Date: Sun, 22 Aug 2004 23:08:30 -0700 Subject: [PATCH] [PATCH] cciss: pdev->intr fix This patch fixes our usage of pdev->intr. We were truncating it to an unchar. We were also reading it before calling pci_enable_device. This patch fixes both of those. Thanks to Bjorn Helgaas for the patch. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/block/cciss.c | 5 ++--- drivers/block/cciss.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index e7800e1614d83..3b93d10746525 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c @@ -2300,7 +2300,6 @@ static int find_PCI_BAR_index(struct pci_dev *pdev, static int cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev) { ushort subsystem_vendor_id, subsystem_device_id, command; - unchar irq = pdev->irq; __u32 board_id, scratchpad = 0; __u64 cfg_offset; __u32 cfg_base_addr; @@ -2359,11 +2358,11 @@ static int cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev) #ifdef CCISS_DEBUG printk("command = %x\n", command); - printk("irq = %x\n", irq); + printk("irq = %x\n", pdev->irq); printk("board_id = %x\n", board_id); #endif /* CCISS_DEBUG */ - c->intr = irq; + c->intr = pdev->irq; /* * Memory base addr is first addr , the second points to the config diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h index 825855cd4ec22..ac073dd2e311f 100644 --- a/drivers/block/cciss.h +++ b/drivers/block/cciss.h @@ -48,7 +48,7 @@ struct ctlr_info unsigned long io_mem_addr; unsigned long io_mem_length; CfgTable_struct *cfgtable; - int intr; + unsigned int intr; int interrupts_enabled; int max_commands; int commands_outstanding; -- 2.53.0