| Message ID | 20170922121405.31789-12-stefan@osg.samsung.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
Hello. On 22.09.2017 14:14, Stefan Schmidt wrote: > Fix some spacing and needed new line. > > Signed-off-by: Stefan Schmidt <stefan@osg.samsung.com> > --- > drivers/net/ieee802154/cc2520.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/ieee802154/cc2520.c b/drivers/net/ieee802154/cc2520.c > index d50add705a79..9c1d1768a36f 100644 > --- a/drivers/net/ieee802154/cc2520.c > +++ b/drivers/net/ieee802154/cc2520.c > @@ -648,7 +648,7 @@ cc2520_set_channel(struct ieee802154_hw *hw, u8 page, u8 channel) > BUG_ON(channel > CC2520_MAXCHANNEL); > > ret = cc2520_write_register(priv, CC2520_FREQCTRL, > - 11 + 5*(channel - 11)); > + 11 + 5 * (channel - 11)); > > return ret; > } > @@ -929,6 +929,7 @@ static int cc2520_get_platform_data(struct spi_device *spi, > > if (!np) { > struct cc2520_platform_data *spi_pdata = spi->dev.platform_data; > + > if (!spi_pdata) > return -ENOENT; > *pdata = *spi_pdata; > This patch has been applied to the wpan-next tree and will be part of the next pull request to net-next. Thanks! regards Stefan Schmidt -- To unsubscribe from this list: send the line "unsubscribe linux-wpan" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ieee802154/cc2520.c b/drivers/net/ieee802154/cc2520.c index d50add705a79..9c1d1768a36f 100644 --- a/drivers/net/ieee802154/cc2520.c +++ b/drivers/net/ieee802154/cc2520.c @@ -648,7 +648,7 @@ cc2520_set_channel(struct ieee802154_hw *hw, u8 page, u8 channel) BUG_ON(channel > CC2520_MAXCHANNEL); ret = cc2520_write_register(priv, CC2520_FREQCTRL, - 11 + 5*(channel - 11)); + 11 + 5 * (channel - 11)); return ret; } @@ -929,6 +929,7 @@ static int cc2520_get_platform_data(struct spi_device *spi, if (!np) { struct cc2520_platform_data *spi_pdata = spi->dev.platform_data; + if (!spi_pdata) return -ENOENT; *pdata = *spi_pdata;
Fix some spacing and needed new line. Signed-off-by: Stefan Schmidt <stefan@osg.samsung.com> --- drivers/net/ieee802154/cc2520.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)