On Tue, Jan 06, 2015 at 03:48:19PM +0100, Philipp Zabel wrote: > If the i2c device tree nodes don't contain the dmas and dma-names property, an > error is displayed for each i2c device: > > of_dma_request_slave_channel: dma-names property of node '/soc/aips-bus@02100000/i2c@021a0000' missing or empty > > This patch avoids calling dma_request_slave_channel if the dma-names property > does not exist in the device tree in the first place. > > Signed-off-by: Philipp Zabel <p.zabel@xxxxxxxxxxxxxx> Aren't you curing the symptoms instead of the cause? Sending a counterpatch in a second... > --- > drivers/i2c/busses/i2c-imx.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c > index 7f3a9fe..f0d9904 100644 > --- a/drivers/i2c/busses/i2c-imx.c > +++ b/drivers/i2c/busses/i2c-imx.c > @@ -288,6 +288,9 @@ static void i2c_imx_dma_request(struct imx_i2c_struct *i2c_imx, > struct device *dev = &i2c_imx->adapter.dev; > int ret; > > + if (!of_get_property(dev->of_node, "dma-names", NULL)) > + return; > + > dma = devm_kzalloc(dev, sizeof(*dma), GFP_KERNEL); > if (!dma) > return; > -- > 2.1.4 >
Attachment:
signature.asc
Description: Digital signature
