Pull acpi_device_handle_cleanup into release branch

[pandora-kernel.git] / drivers / ide / pci / trm290.c

diff --git a/drivers/ide/pci/trm290.c b/drivers/ide/pci/trm290.c
index c26c8ca..2a28252 100644 (file)
--- a/drivers/ide/pci/trm290.c
+++ b/drivers/ide/pci/trm290.c
@@ -128,7 +128,6 @@
  *
  */
 
-#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
@@ -183,8 +182,7 @@ static void trm290_ide_dma_exec_cmd(ide_drive_t *drive, u8 command)
 {
        ide_hwif_t *hwif        = HWIF(drive);
 
-       if (HWGROUP(drive)->handler != NULL)    /* paranoia check */
-               BUG();
+       BUG_ON(HWGROUP(drive)->handler != NULL);        /* paranoia check */
        ide_set_handler(drive, &ide_dma_intr, WAIT_CMD, NULL);
        /* issue cmd to drive */
        hwif->OUTB(command, IDE_COMMAND_REG);