diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-01-15 18:27:20 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-01-15 18:27:20 +0100 |
| commit | c0106d72b8d71696dbe9dc80e2c77d4ac63f7531 (patch) | |
| tree | ca96d2baecb0555e36219ed6968dc8e306e530ca /drivers/spi/pxa2xx_spi.c | |
| parent | 5852973c129cf7c7e6c229abb7250673fc2a50c9 (diff) | |
| parent | eff317d0834ad1ff03f747f6bc2d76b9a9c95160 (diff) | |
| download | kernel-crypto-c0106d72b8d71696dbe9dc80e2c77d4ac63f7531.tar.gz kernel-crypto-c0106d72b8d71696dbe9dc80e2c77d4ac63f7531.tar.xz kernel-crypto-c0106d72b8d71696dbe9dc80e2c77d4ac63f7531.zip | |
Merge branch 'topic/asoc' into next/asoc
Diffstat (limited to 'drivers/spi/pxa2xx_spi.c')
| -rw-r--r-- | drivers/spi/pxa2xx_spi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/spi/pxa2xx_spi.c b/drivers/spi/pxa2xx_spi.c index 6104f461a3c..d0fc4ca2f65 100644 --- a/drivers/spi/pxa2xx_spi.c +++ b/drivers/spi/pxa2xx_spi.c @@ -1561,11 +1561,12 @@ out_error_master_alloc: static int pxa2xx_spi_remove(struct platform_device *pdev) { struct driver_data *drv_data = platform_get_drvdata(pdev); - struct ssp_device *ssp = drv_data->ssp; + struct ssp_device *ssp; int status = 0; if (!drv_data) return 0; + ssp = drv_data->ssp; /* Remove the queue */ status = destroy_queue(drv_data); |