|
@@ -5,8 +5,8 @@
|
|
*
|
|
*
|
|
* GPL LICENSE SUMMARY
|
|
* GPL LICENSE SUMMARY
|
|
*
|
|
*
|
|
- * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.
|
|
|
|
- * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
|
|
|
|
|
|
+ * Copyright(c) 2007 - 2015 Intel Corporation. All rights reserved.
|
|
|
|
+ * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
|
|
*
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of version 2 of the GNU General Public License as
|
|
* it under the terms of version 2 of the GNU General Public License as
|
|
@@ -31,8 +31,8 @@
|
|
*
|
|
*
|
|
* BSD LICENSE
|
|
* BSD LICENSE
|
|
*
|
|
*
|
|
- * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
|
|
|
|
- * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
|
|
|
|
|
|
+ * Copyright(c) 2005 - 2015 Intel Corporation. All rights reserved.
|
|
|
|
+ * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
|
|
* All rights reserved.
|
|
* All rights reserved.
|
|
*
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* Redistribution and use in source and binary forms, with or without
|
|
@@ -104,7 +104,7 @@ static void iwl_pcie_free_fw_monitor(struct iwl_trans *trans)
|
|
static void iwl_pcie_alloc_fw_monitor(struct iwl_trans *trans)
|
|
static void iwl_pcie_alloc_fw_monitor(struct iwl_trans *trans)
|
|
{
|
|
{
|
|
struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
|
|
struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
|
|
- struct page *page;
|
|
|
|
|
|
+ struct page *page = NULL;
|
|
dma_addr_t phys;
|
|
dma_addr_t phys;
|
|
u32 size;
|
|
u32 size;
|
|
u8 power;
|
|
u8 power;
|
|
@@ -131,6 +131,7 @@ static void iwl_pcie_alloc_fw_monitor(struct iwl_trans *trans)
|
|
DMA_FROM_DEVICE);
|
|
DMA_FROM_DEVICE);
|
|
if (dma_mapping_error(trans->dev, phys)) {
|
|
if (dma_mapping_error(trans->dev, phys)) {
|
|
__free_pages(page, order);
|
|
__free_pages(page, order);
|
|
|
|
+ page = NULL;
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
IWL_INFO(trans,
|
|
IWL_INFO(trans,
|