xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'spi/topic/pdata' into spi-next

Browse Source
This commit is contained in:
Mark Brown
2013-06-26 16:21:02 +01:00
parent 1728ddb2ca 24b5a82cf5
commit 3d09da11b5
15 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/spi/spi-omap-100k.c
View File

@@ -502,7 +502,7 @@ static int omap1_spi100k_probe(struct platform_device *pdev)
master->mode_bits = MODEBITS;
master->bits_per_word_mask = SPI_BPW_RANGE_MASK(4, 32);
dev_set_drvdata(&pdev->dev, master);
platform_set_drvdata(pdev, master);
spi100k = spi_master_get_devdata(master);
spi100k->master = master;
@@ -561,7 +561,7 @@ static int omap1_spi100k_remove(struct platform_device *pdev)
unsigned long flags;
int status = 0;
master = dev_get_drvdata(&pdev->dev);
master = platform_get_drvdata(pdev);
spi100k = spi_master_get_devdata(master);
spin_lock_irqsave(&spi100k->lock, flags);