diff --git a/[refs] b/[refs] index b96f8ee9068a..b3e7365d1092 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c1a13ff57ab1ce52a0aae9984594dbfcfbaf68c0 +refs/heads/master: e44a45ae7b7f7c7a4ebd6aa39b703bf2b97fe848 diff --git a/trunk/drivers/spi/spi.c b/trunk/drivers/spi/spi.c index c3219b29b5ac..4831edbae2d5 100644 --- a/trunk/drivers/spi/spi.c +++ b/trunk/drivers/spi/spi.c @@ -411,7 +411,7 @@ EXPORT_SYMBOL_GPL(spi_alloc_master); */ int spi_register_master(struct spi_master *master) { - static atomic_t dyn_bus_id = ATOMIC_INIT((1<<16) - 1); + static atomic_t dyn_bus_id = ATOMIC_INIT((1<<15) - 1); struct device *dev = master->cdev.dev; int status = -ENODEV; int dynamic = 0;