aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/irda
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/irda')
-rw-r--r--drivers/net/irda/mcs7780.c2
-rw-r--r--drivers/net/irda/sir_dev.c2
-rw-r--r--drivers/net/irda/stir4200.c2
-rw-r--r--drivers/net/irda/vlsi_ir.h6
4 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/irda/mcs7780.c b/drivers/net/irda/mcs7780.c
index 808939b9f8fb..0b769192d4ce 100644
--- a/drivers/net/irda/mcs7780.c
+++ b/drivers/net/irda/mcs7780.c
@@ -464,7 +464,7 @@ static void mcs_unwrap_fir(struct mcs_cb *mcs, __u8 *buf, int len)
464 } 464 }
465 465
466 fcs = ~(crc32_le(~0, buf, new_len)); 466 fcs = ~(crc32_le(~0, buf, new_len));
467 if(fcs != le32_to_cpu(get_unaligned((u32 *)(buf+new_len)))) { 467 if(fcs != le32_to_cpu(get_unaligned((__le32 *)(buf+new_len)))) {
468 IRDA_ERROR("crc error calc 0x%x len %d\n", fcs, new_len); 468 IRDA_ERROR("crc error calc 0x%x len %d\n", fcs, new_len);
469 mcs->stats.rx_errors++; 469 mcs->stats.rx_errors++;
470 mcs->stats.rx_crc_errors++; 470 mcs->stats.rx_crc_errors++;
diff --git a/drivers/net/irda/sir_dev.c b/drivers/net/irda/sir_dev.c
index bbe4e094c424..6078e03de9a8 100644
--- a/drivers/net/irda/sir_dev.c
+++ b/drivers/net/irda/sir_dev.c
@@ -414,7 +414,7 @@ EXPORT_SYMBOL(sirdev_raw_read);
414int sirdev_set_dtr_rts(struct sir_dev *dev, int dtr, int rts) 414int sirdev_set_dtr_rts(struct sir_dev *dev, int dtr, int rts)
415{ 415{
416 int ret = -ENXIO; 416 int ret = -ENXIO;
417 if (dev->drv->set_dtr_rts != 0) 417 if (dev->drv->set_dtr_rts)
418 ret = dev->drv->set_dtr_rts(dev, dtr, rts); 418 ret = dev->drv->set_dtr_rts(dev, dtr, rts);
419 return ret; 419 return ret;
420} 420}
diff --git a/drivers/net/irda/stir4200.c b/drivers/net/irda/stir4200.c
index 1afaee0fa7e0..042bc2f0417d 100644
--- a/drivers/net/irda/stir4200.c
+++ b/drivers/net/irda/stir4200.c
@@ -332,7 +332,7 @@ static void fir_eof(struct stir_cb *stir)
332 } 332 }
333 333
334 fcs = ~(crc32_le(~0, rx_buff->data, len)); 334 fcs = ~(crc32_le(~0, rx_buff->data, len));
335 if (fcs != le32_to_cpu(get_unaligned((u32 *)(rx_buff->data+len)))) { 335 if (fcs != le32_to_cpu(get_unaligned((__le32 *)(rx_buff->data+len)))) {
336 pr_debug("crc error calc 0x%x len %d\n", fcs, len); 336 pr_debug("crc error calc 0x%x len %d\n", fcs, len);
337 stir->stats.rx_errors++; 337 stir->stats.rx_errors++;
338 stir->stats.rx_crc_errors++; 338 stir->stats.rx_crc_errors++;
diff --git a/drivers/net/irda/vlsi_ir.h b/drivers/net/irda/vlsi_ir.h
index ca12a6096419..c8b9c74eea52 100644
--- a/drivers/net/irda/vlsi_ir.h
+++ b/drivers/net/irda/vlsi_ir.h
@@ -537,10 +537,10 @@ calc_width_bits(unsigned baudrate, unsigned widthselect, unsigned clockselect)
537 */ 537 */
538 538
539struct ring_descr_hw { 539struct ring_descr_hw {
540 volatile u16 rd_count; /* tx/rx count [11:0] */ 540 volatile __le16 rd_count; /* tx/rx count [11:0] */
541 u16 reserved; 541 __le16 reserved;
542 union { 542 union {
543 u32 addr; /* [23:0] of the buffer's busaddress */ 543 __le32 addr; /* [23:0] of the buffer's busaddress */
544 struct { 544 struct {
545 u8 addr_res[3]; 545 u8 addr_res[3];
546 volatile u8 status; /* descriptor status */ 546 volatile u8 status; /* descriptor status */