aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/irda/via-ircc.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/irda/via-ircc.c b/drivers/net/irda/via-ircc.c
index 2900af091c2d..998bb89ede71 100644
--- a/drivers/net/irda/via-ircc.c
+++ b/drivers/net/irda/via-ircc.c
@@ -510,10 +510,8 @@ static void via_hw_init(struct via_ircc_cb *self)
510 */ 510 */
511static int via_ircc_read_dongle_id(int iobase) 511static int via_ircc_read_dongle_id(int iobase)
512{ 512{
513 int dongle_id = 9; /* Default to IBM */
514
515 IRDA_ERROR("via-ircc: dongle probing not supported, please specify dongle_id module parameter.\n"); 513 IRDA_ERROR("via-ircc: dongle probing not supported, please specify dongle_id module parameter.\n");
516 return dongle_id; 514 return 9; /* Default to IBM */
517} 515}
518 516
519/* 517/*
@@ -926,7 +924,6 @@ static int via_ircc_dma_xmit(struct via_ircc_cb *self, u16 iobase)
926static int via_ircc_dma_xmit_complete(struct via_ircc_cb *self) 924static int via_ircc_dma_xmit_complete(struct via_ircc_cb *self)
927{ 925{
928 int iobase; 926 int iobase;
929 int ret = TRUE;
930 u8 Tx_status; 927 u8 Tx_status;
931 928
932 IRDA_DEBUG(3, "%s()\n", __func__); 929 IRDA_DEBUG(3, "%s()\n", __func__);
@@ -983,7 +980,7 @@ F01_E*/
983 // Tell the network layer, that we can accept more frames 980 // Tell the network layer, that we can accept more frames
984 netif_wake_queue(self->netdev); 981 netif_wake_queue(self->netdev);
985//F01 } 982//F01 }
986 return ret; 983 return TRUE;
987} 984}
988 985
989/* 986/*