Commit 4d480efa authored Sep 04, 2012 by Greg Kroah-Hartman

Merge branch 'staging-linus' into staging-next



This gets the 6 staging comedi patches that are needed for further
patches that Ian sent.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parents 9ac6eb40 4a7a4f95

drivers/staging/comedi/drivers/amplc_dio200.c

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1421,6 +1421,13 @@ static int __devinit dio200_attach_pci(struct comedi_device *dev,
	dev_err(dev->class_dev, "BUG! cannot determine board type!\n");		dev_err(dev->class_dev, "BUG! cannot determine board type!\n");
	return -EINVAL;		return -EINVAL;
	}		}
			/*
			* Need to 'get' the PCI device to match the 'put' in dio200_detach().
			* TODO: Remove the pci_dev_get() and matching pci_dev_put() once
			* support for manual attachment of PCI devices via dio200_attach()
			* has been removed.
			*/
			pci_dev_get(pci_dev);
	return dio200_pci_common_attach(dev, pci_dev);		return dio200_pci_common_attach(dev, pci_dev);
	}		}

drivers/staging/comedi/drivers/amplc_pc236.c

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -578,6 +578,13 @@ static int __devinit pc236_attach_pci(struct comedi_device *dev,
	dev_err(dev->class_dev, "BUG! cannot determine board type!\n");		dev_err(dev->class_dev, "BUG! cannot determine board type!\n");
	return -EINVAL;		return -EINVAL;
	}		}
			/*
			* Need to 'get' the PCI device to match the 'put' in pc236_detach().
			* TODO: Remove the pci_dev_get() and matching pci_dev_put() once
			* support for manual attachment of PCI devices via pc236_attach()
			* has been removed.
			*/
			pci_dev_get(pci_dev);
	return pc236_pci_common_attach(dev, pci_dev);		return pc236_pci_common_attach(dev, pci_dev);
	}		}

drivers/staging/comedi/drivers/amplc_pc263.c

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -309,6 +309,13 @@ static int __devinit pc263_attach_pci(struct comedi_device *dev,
	dev_err(dev->class_dev, "BUG! cannot determine board type!\n");		dev_err(dev->class_dev, "BUG! cannot determine board type!\n");
	return -EINVAL;		return -EINVAL;
	}		}
			/*
			* Need to 'get' the PCI device to match the 'put' in pc263_detach().
			* TODO: Remove the pci_dev_get() and matching pci_dev_put() once
			* support for manual attachment of PCI devices via pc263_attach()
			* has been removed.
			*/
			pci_dev_get(pci_dev);
	return pc263_pci_common_attach(dev, pci_dev);		return pc263_pci_common_attach(dev, pci_dev);
	}		}

drivers/staging/comedi/drivers/amplc_pci224.c

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1503,6 +1503,13 @@ pci224_attach_pci(struct comedi_device dev, struct pci_dev pci_dev)
	DRIVER_NAME ": BUG! cannot determine board type!\n");		DRIVER_NAME ": BUG! cannot determine board type!\n");
	return -EINVAL;		return -EINVAL;
	}		}
			/*
			* Need to 'get' the PCI device to match the 'put' in pci224_detach().
			* TODO: Remove the pci_dev_get() and matching pci_dev_put() once
			* support for manual attachment of PCI devices via pci224_attach()
			* has been removed.
			*/
			pci_dev_get(pci_dev);
	return pci224_attach_common(dev, pci_dev, NULL);		return pci224_attach_common(dev, pci_dev, NULL);
	}		}

drivers/staging/comedi/drivers/amplc_pci230.c

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2925,6 +2925,13 @@ static int __devinit pci230_attach_pci(struct comedi_device *dev,
	"amplc_pci230: BUG! cannot determine board type!\n");		"amplc_pci230: BUG! cannot determine board type!\n");
	return -EINVAL;		return -EINVAL;
	}		}
			/*
			* Need to 'get' the PCI device to match the 'put' in pci230_detach().
			* TODO: Remove the pci_dev_get() and matching pci_dev_put() once
			* support for manual attachment of PCI devices via pci230_attach()
			* has been removed.
			*/
			pci_dev_get(pci_dev);
	return pci230_attach_common(dev, pci_dev);		return pci230_attach_common(dev, pci_dev);
	}		}