Commit c7a1fcf3 authored by Jonghwan Choi's avatar Jonghwan Choi Committed by Samuel Ortiz
Browse files

mfd: Fix s5m error handling for invalid device type 



If device type is not supported in driver, have to retun error.

Signed-off-by: default avatarJonghwan Choi <jhbird.choi@samsung.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent c3ebb30a

drivers/mfd/s5m-irq.c

+11 −3
Original line number Diff line number Diff line
@@ -342,7 +342,10 @@ int s5m_irq_resume(struct s5m87xx_dev *s5m87xx) 
			s5m8767_irq_thread(s5m87xx->irq_base, s5m87xx);

			break;

		default:

			break;

			dev_err(s5m87xx->dev,

				"Unknown device type %d\n",

				s5m87xx->device_type);

			return -EINVAL;



		}

	}
@@ -444,7 +447,9 @@ int s5m_irq_init(struct s5m87xx_dev *s5m87xx) 
		}

		break;

	default:

		break;

		dev_err(s5m87xx->dev,

			"Unknown device type %d\n", s5m87xx->device_type);

		return -EINVAL;

	}



	if (!s5m87xx->ono)
@@ -467,12 +472,15 @@ int s5m_irq_init(struct s5m87xx_dev *s5m87xx) 
					IRQF_ONESHOT, "s5m87xx-ono", s5m87xx);

		break;

	default:

		ret = -EINVAL;

		break;

	}



	if (ret)

	if (ret) {

		dev_err(s5m87xx->dev, "Failed to request IRQ %d: %d\n",

			s5m87xx->ono, ret);

		return ret;

	}



	return 0;

}