diff --git a/[refs] b/[refs]
index 624158cfd9aa..ea8d2c686649 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d20fb18be246d196225ed151c126832b2dab6506
+refs/heads/master: 17bebdcd5c7c56cde82b8ccb02c5cea69e05f6d3
diff --git a/trunk/drivers/crypto/bfin_crc.c b/trunk/drivers/crypto/bfin_crc.c
index 5398580b4313..06fa1e4f49d3 100644
--- a/trunk/drivers/crypto/bfin_crc.c
+++ b/trunk/drivers/crypto/bfin_crc.c
@@ -694,7 +694,7 @@ static int __devinit bfin_crypto_crc_probe(struct platform_device *pdev)
 		dma_free_coherent(&pdev->dev, PAGE_SIZE, crc->sg_cpu, crc->sg_dma);
 	free_dma(crc->dma_ch);
 out_error_irq:
-	free_irq(crc->irq, crc->dev);
+	free_irq(crc->irq, crc);
 out_error_unmap:
 	iounmap((void *)crc->regs);
 out_error_free_mem:
@@ -720,10 +720,10 @@ static int __devexit bfin_crypto_crc_remove(struct platform_device *pdev)
 
 	crypto_unregister_ahash(&algs);
 	tasklet_kill(&crc->done_task);
-	iounmap((void *)crc->regs);
 	free_dma(crc->dma_ch);
 	if (crc->irq > 0)
-		free_irq(crc->irq, crc->dev);
+		free_irq(crc->irq, crc);
+	iounmap((void *)crc->regs);
 	kfree(crc);
 
 	return 0;