diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-05-17 08:23:04 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-05-17 08:23:04 -0400 |
| commit | 5cf4cf65a8ccca44ec9b357ebdb2b517269d7e8a (patch) | |
| tree | beba3ecc27c64e0c22b1a21201f1999afe9834f2 /drivers/spi/spidev.c | |
| parent | 55d3ecab2d16be3525ba24a96ba3a67692af1f09 (diff) | |
| parent | b2cd64153b94473f6bd82448a68b8e8c041676ea (diff) | |
Merge branch 'master' of /home/trondmy/repositories/git/linux-2.6/
Diffstat (limited to 'drivers/spi/spidev.c')
| -rw-r--r-- | drivers/spi/spidev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c index c0a6dce800a3..225d6b2f82dd 100644 --- a/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c | |||
| @@ -484,7 +484,7 @@ static int spidev_probe(struct spi_device *spi) | |||
| 484 | * Reusing minors is fine so long as udev or mdev is working. | 484 | * Reusing minors is fine so long as udev or mdev is working. |
| 485 | */ | 485 | */ |
| 486 | mutex_lock(&device_list_lock); | 486 | mutex_lock(&device_list_lock); |
| 487 | minor = find_first_zero_bit(minors, ARRAY_SIZE(minors)); | 487 | minor = find_first_zero_bit(minors, N_SPI_MINORS); |
| 488 | if (minor < N_SPI_MINORS) { | 488 | if (minor < N_SPI_MINORS) { |
| 489 | spidev->dev.parent = &spi->dev; | 489 | spidev->dev.parent = &spi->dev; |
| 490 | spidev->dev.class = &spidev_class; | 490 | spidev->dev.class = &spidev_class; |