From 9a0f9a40a1661103bcd401599f365c4577d7ba6f Mon Sep 17 00:00:00 2001 From: Ming Lei Date: Thu, 13 Sep 2012 10:33:28 +0800 Subject: [PATCH] --- yaml --- r: 328215 b: refs/heads/master c: e962610f8100e1b52973f5a9c855cbc3d1ba04ec h: refs/heads/master i: 328213: 312bb797c2a5350e0c7267527b2edb7412064260 328211: 8d0d3b4db69a59e5b8f214c4d02be46f9a897db2 328207: 0351cdaf00c5a0ab4fedde4a95a63a5c7c6e60af v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath9k/hif_usb.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9e664c4ad1c0..be49d412bbe4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7a03414686d8e01c660bf69df22cafcfd2753626 +refs/heads/master: e962610f8100e1b52973f5a9c855cbc3d1ba04ec diff --git a/trunk/drivers/net/wireless/ath/ath9k/hif_usb.c b/trunk/drivers/net/wireless/ath/ath9k/hif_usb.c index ee6e50aebf8d..924c4616c3d9 100644 --- a/trunk/drivers/net/wireless/ath/ath9k/hif_usb.c +++ b/trunk/drivers/net/wireless/ath/ath9k/hif_usb.c @@ -1072,14 +1072,15 @@ static void ath9k_hif_usb_dev_deinit(struct hif_device_usb *hif_dev) */ static void ath9k_hif_usb_firmware_fail(struct hif_device_usb *hif_dev) { - struct device *parent = hif_dev->udev->dev.parent; + struct device *dev = &hif_dev->udev->dev; + struct device *parent = dev->parent; complete(&hif_dev->fw_done); if (parent) device_lock(parent); - device_release_driver(&hif_dev->udev->dev); + device_release_driver(dev); if (parent) device_unlock(parent);