Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 249017
b: refs/heads/master
c: 628a7dd
h: refs/heads/master
i:
  249015: e89da2d
v: v3
  • Loading branch information
Luis R. Rodriguez authored and Greg Kroah-Hartman committed Apr 5, 2011
1 parent a7720ce commit c58169e
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 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: 437c567b1a02bdd50a9d0ce57c1310b827eb0ae4
refs/heads/master: 628a7dd85cff27db40a1759d883a76a6fef20346
7 changes: 0 additions & 7 deletions trunk/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,6 @@ static void ath6kl_hifdev_remove(struct sdio_func *func)
{
int status = 0;
struct hif_device *device;
AR_DEBUG_ASSERT(func != NULL);

device = ath6kl_get_hifdev(func);
if (device->claimedContext != NULL)
Expand All @@ -159,8 +158,6 @@ static void ath6kl_hifdev_remove(struct sdio_func *func)
CleanupHIFScatterResources(device);

delHifDevice(device);
AR_DEBUG_ASSERT(status == 0);
AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: -hifDeviceRemoved\n"));
}

#if defined(CONFIG_PM)
Expand All @@ -171,7 +168,6 @@ static int ath6kl_hifdev_suspend(struct device *dev)
struct hif_device *device;

device = ath6kl_get_hifdev(func);
AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: +ath6kl_hifdev_suspend\n"));

if (device && device->claimedContext &&
osdrvCallbacks.deviceSuspendHandler) {
Expand All @@ -184,7 +180,6 @@ static int ath6kl_hifdev_suspend(struct device *dev)
}

CleanupHIFScatterResources(device);
AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: -ath6kl_hifdev_suspend\n"));

switch (status) {
case 0:
Expand All @@ -204,15 +199,13 @@ static int ath6kl_hifdev_resume(struct device *dev)
struct hif_device *device;

device = ath6kl_get_hifdev(func);
AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: +ath6kl_hifdev_resume\n"));
if (device && device->claimedContext &&
osdrvCallbacks.deviceSuspendHandler) {
status = osdrvCallbacks.
deviceResumeHandler(device->claimedContext);
if (status == 0)
device->is_suspend = false;
}
AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("AR6000: -ath6kl_hifdev_resume\n"));

return status;
}
Expand Down

0 comments on commit c58169e

Please sign in to comment.