diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-19 19:04:47 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-19 19:04:47 +0200 |
| commit | 3e10e879a8c334a5927d800a3663a24d562cfa31 (patch) | |
| tree | 5d18bc7e38c986a044e99aa0d0a4aff4931ec7d0 /drivers/spi/spidev.c | |
| parent | 98d9c66ab07471006fd7910cb16453581c41a3e7 (diff) | |
| parent | 0cfd81031a26717fe14380d18275f8e217571615 (diff) | |
| download | kernel-crypto-3e10e879a8c334a5927d800a3663a24d562cfa31.tar.gz kernel-crypto-3e10e879a8c334a5927d800a3663a24d562cfa31.tar.xz kernel-crypto-3e10e879a8c334a5927d800a3663a24d562cfa31.zip | |
Merge branch 'linus' into tracing-v28-for-linus-v3
Conflicts:
init/main.c
kernel/module.c
scripts/bootgraph.pl
Diffstat (limited to 'drivers/spi/spidev.c')
| -rw-r--r-- | drivers/spi/spidev.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c index e5e0cfed5e3..89a43755a45 100644 --- a/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c @@ -583,10 +583,9 @@ static int spidev_probe(struct spi_device *spi) struct device *dev; spidev->devt = MKDEV(SPIDEV_MAJOR, minor); - dev = device_create_drvdata(spidev_class, &spi->dev, - spidev->devt, spidev, - "spidev%d.%d", - spi->master->bus_num, spi->chip_select); + dev = device_create(spidev_class, &spi->dev, spidev->devt, + spidev, "spidev%d.%d", + spi->master->bus_num, spi->chip_select); status = IS_ERR(dev) ? PTR_ERR(dev) : 0; } else { dev_dbg(&spi->dev, "no minor number available!\n"); |