From fd825a16c6069a3849159179f0156ca114e33e7c Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Wed, 19 May 2010 15:11:58 +0100 Subject: [PATCH] --- yaml --- r: 199861 b: refs/heads/master c: b2e68b00d5d3698c228f549c02f4f79305d2b270 h: refs/heads/master i: 199859: a4e6041c4362f69838634336c89f6fa1d1995ceb v: v3 --- [refs] | 2 +- .../drivers/staging/comedi/drivers/addi-data/addi_common.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 2e462cf8612f..1a438be5b643 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6d8b0f5be5108f6a3fc922ca4acfbf10e14d6cd0 +refs/heads/master: b2e68b00d5d3698c228f549c02f4f79305d2b270 diff --git a/trunk/drivers/staging/comedi/drivers/addi-data/addi_common.c b/trunk/drivers/staging/comedi/drivers/addi-data/addi_common.c index d7f9bf49bb75..b18e81d8cf8a 100644 --- a/trunk/drivers/staging/comedi/drivers/addi-data/addi_common.c +++ b/trunk/drivers/staging/comedi/drivers/addi-data/addi_common.c @@ -2574,10 +2574,6 @@ static int i_ADDI_Attach(struct comedi_device *dev, struct comedi_devconfig *it) struct pcilst_struct *card = NULL; unsigned char pci_bus, pci_slot, pci_func; int i_Dma = 0; - static char c_Identifier[150]; - - sprintf(c_Identifier, "Addi-Data GmbH Comedi %s", - this_board->pc_DriverName); ret = alloc_private(dev, sizeof(struct addi_private)); if (ret < 0) @@ -2652,7 +2648,7 @@ static int i_ADDI_Attach(struct comedi_device *dev, struct comedi_devconfig *it) if (irq > 0) { if (request_irq(irq, v_ADDI_Interrupt, IRQF_SHARED, - c_Identifier, dev) < 0) { + this_board->pc_DriverName, dev) < 0) { printk(", unable to allocate IRQ %u, DISABLING IT", irq); irq = 0; /* Can't use IRQ */