68aa4cb337
Merge remote-tracking branch 'spi/topic/pdata' into spi-next
2013-09-01 13:49:03 +01:00
11c28cfc1e
Merge remote-tracking branch 'spi/topic/orion' into spi-next
2013-09-01 13:49:02 +01:00
4374f332d9
Merge remote-tracking branch 'spi/topic/omap-100k' into spi-next
2013-09-01 13:49:01 +01:00
45bb5065e1
Merge remote-tracking branch 'spi/topic/octeon' into spi-next
2013-09-01 13:49:00 +01:00
455765f02e
Merge remote-tracking branch 'spi/topic/nuc900' into spi-next
2013-09-01 13:48:59 +01:00
7c2fde9b1a
Merge remote-tracking branch 'spi/topic/mxs' into spi-next
2013-09-01 13:48:59 +01:00
9020b75467
Merge remote-tracking branch 'spi/topic/msglen' into spi-next
2013-09-01 13:48:58 +01:00
84c86edab3
Merge remote-tracking branch 'spi/topic/mpc512x' into spi-next
2013-09-01 13:48:57 +01:00
4faad26c27
Merge remote-tracking branch 'spi/topic/ioremap' into spi-next
2013-09-01 13:48:56 +01:00
8e37befc5c
Merge remote-tracking branch 'spi/topic/imx' into spi-next
2013-09-01 13:48:55 +01:00
497cb4473a
Merge remote-tracking branch 'spi/topic/ep93xx' into spi-next
2013-09-01 13:48:54 +01:00
afa8f0cd6c
Merge remote-tracking branch 'spi/topic/efm32' into spi-next
2013-09-01 13:48:53 +01:00
2f2613b028
Merge remote-tracking branch 'spi/topic/dspi' into spi-next
2013-09-01 13:48:52 +01:00
96b1a28d65
Merge remote-tracking branch 'spi/topic/doc' into spi-next
2013-09-01 13:48:51 +01:00
b49247907d
Merge remote-tracking branch 'spi/topic/davinci' into spi-next
2013-09-01 13:48:51 +01:00
7e718b4bd2
Merge remote-tracking branch 'spi/topic/core' into spi-next
2013-09-01 13:48:50 +01:00
1f54f94284
Merge remote-tracking branch 'spi/topic/clps711x' into spi-next
2013-09-01 13:48:49 +01:00
db04e17055
Merge remote-tracking branch 'spi/topic/checks' into spi-next
2013-09-01 13:48:48 +01:00
788a739676
Merge remote-tracking branch 'spi/topic/build' into spi-next
2013-09-01 13:48:47 +01:00
8e28fb63a7
Merge remote-tracking branch 'spi/topic/bpw' into spi-next
2013-09-01 13:48:46 +01:00
f1632c3278
Merge remote-tracking branch 'spi/topic/blackfin-v3' into spi-next
2013-09-01 13:48:45 +01:00
b29bc3df37
Merge remote-tracking branch 'spi/topic/bitbang' into spi-next
2013-09-01 13:48:44 +01:00
c3dbe2b76a
Merge remote-tracking branch 'spi/topic/bcm2835' into spi-next
2013-09-01 13:48:44 +01:00
5264af0ca6
Merge remote-tracking branch 'spi/topic/atmel' into spi-next
2013-09-01 13:48:43 +01:00
e93b07244d
spi: core: Fix spi_register_master error handling
...
In the case spi_master_initialize_queue() fails, current code calls
device_unregister() before return error from spi_register_master().
However, all the drivers call spi_master_put() in the error path if
spi_register_master() fails. Thus we should call device_del() rather than
device_unregister() before return error from spi_register_master().
This also makes all the spi_register_master() error handling consistent,
because all other error paths of spi_register_master() expect drivers to
call spi_master_put() if spi_register_master() fails.
Signed-off-by: Axel Lin <axel.lin@ingics.com >
Signed-off-by: Mark Brown <broonie@linaro.org >
2013-08-31 17:51:06 +01:00
Mark Brown
Axel Lin