Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 269345
b: refs/heads/master
c: 90f0adf
h: refs/heads/master
i:
  269343: 57c7c1c
v: v3
  • Loading branch information
Sergei Shtylyov authored and Jeff Garzik committed Oct 14, 2011
1 parent 4b2a199 commit 93322c5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 46b9e77076a609d10b2009310a1e58281f8daaf9
refs/heads/master: 90f0adf0936d464a337512e6cbe7929a49bf3c55
6 changes: 2 additions & 4 deletions trunk/drivers/ata/pata_arasan_cf.c
Original file line number Diff line number Diff line change
Expand Up @@ -922,8 +922,7 @@ static int __devexit arasan_cf_remove(struct platform_device *pdev)
#ifdef CONFIG_PM
static int arasan_cf_suspend(struct device *dev)
{
struct platform_device *pdev = to_platform_device(dev);
struct ata_host *host = dev_get_drvdata(&pdev->dev);
struct ata_host *host = dev_get_drvdata(dev);
struct arasan_cf_dev *acdev = host->ports[0]->private_data;

if (acdev->dma_chan) {
Expand All @@ -937,8 +936,7 @@ static int arasan_cf_suspend(struct device *dev)

static int arasan_cf_resume(struct device *dev)
{
struct platform_device *pdev = to_platform_device(dev);
struct ata_host *host = dev_get_drvdata(&pdev->dev);
struct ata_host *host = dev_get_drvdata(dev);
struct arasan_cf_dev *acdev = host->ports[0]->private_data;

cf_init(acdev);
Expand Down

0 comments on commit 93322c5

Please sign in to comment.