From eef79c7611f392bfaa5edfcd1e4f6b8c056d4520 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 24 Sep 2012 13:22:31 -0700 Subject: [PATCH] --- yaml --- r: 325528 b: refs/heads/master c: 7c843aa7731c774a78a31b6dab371024c4756d38 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/s626.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index d5a086305aa8..d108ae1068aa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f574af6d268240a68f99fac9f2f42ce38b26eae9 +refs/heads/master: 7c843aa7731c774a78a31b6dab371024c4756d38 diff --git a/trunk/drivers/staging/comedi/drivers/s626.c b/trunk/drivers/staging/comedi/drivers/s626.c index e30833f4178c..fb215b24fce8 100644 --- a/trunk/drivers/staging/comedi/drivers/s626.c +++ b/trunk/drivers/staging/comedi/drivers/s626.c @@ -2453,11 +2453,12 @@ static int s626_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev) struct comedi_subdevice *s; comedi_set_hw_dev(dev, &pcidev->dev); + dev->board_name = dev->driver->driver_name; if (alloc_private(dev, sizeof(struct s626_private)) < 0) return -ENOMEM; - result = comedi_pci_enable(pcidev, "s626"); + result = comedi_pci_enable(pcidev, dev->board_name); if (result < 0) { printk(KERN_ERR "s626_attach: comedi_pci_enable fails\n"); return -ENODEV; @@ -2510,8 +2511,6 @@ static int s626_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev) } - dev->board_name = dev->driver->driver_name; - ret = comedi_alloc_subdevices(dev, 6); if (ret) return ret; @@ -2524,7 +2523,7 @@ static int s626_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev) printk(KERN_ERR " unknown irq (bad)\n"); } else { ret = request_irq(dev->irq, s626_irq_handler, IRQF_SHARED, - "s626", dev); + dev->board_name, dev); if (ret < 0) { printk(KERN_ERR " irq not available\n");