Commit e7966cf3 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] gcc-3.5: zatm.c fix

drivers/atm/zatm.c: In function `zatm_close':
drivers/atm/zatm.c:1371: error: invalid lvalue in assignment
drivers/atm/zatm.c: In function `zatm_open':
drivers/atm/zatm.c:1386: error: invalid lvalue in assignment
drivers/atm/zatm.c:1398: error: invalid lvalue in assignment
drivers/atm/zatm.c: In function `zatm_module_init':
drivers/atm/zatm.c:1600: error: invalid lvalue in assignment
parent 6abf6a9a
...@@ -1368,7 +1368,7 @@ static void zatm_close(struct atm_vcc *vcc) ...@@ -1368,7 +1368,7 @@ static void zatm_close(struct atm_vcc *vcc)
DPRINTK("zatm_close: done waiting\n"); DPRINTK("zatm_close: done waiting\n");
/* deallocate memory */ /* deallocate memory */
kfree(ZATM_VCC(vcc)); kfree(ZATM_VCC(vcc));
ZATM_VCC(vcc) = NULL; vcc->dev_data = NULL;
clear_bit(ATM_VF_ADDR,&vcc->flags); clear_bit(ATM_VF_ADDR,&vcc->flags);
} }
...@@ -1383,7 +1383,8 @@ static int zatm_open(struct atm_vcc *vcc) ...@@ -1383,7 +1383,8 @@ static int zatm_open(struct atm_vcc *vcc)
DPRINTK(">zatm_open\n"); DPRINTK(">zatm_open\n");
zatm_dev = ZATM_DEV(vcc->dev); zatm_dev = ZATM_DEV(vcc->dev);
if (!test_bit(ATM_VF_PARTIAL,&vcc->flags)) ZATM_VCC(vcc) = NULL; if (!test_bit(ATM_VF_PARTIAL,&vcc->flags))
vcc->dev_data = NULL;
if (vci != ATM_VPI_UNSPEC && vpi != ATM_VCI_UNSPEC) if (vci != ATM_VPI_UNSPEC && vpi != ATM_VCI_UNSPEC)
set_bit(ATM_VF_ADDR,&vcc->flags); set_bit(ATM_VF_ADDR,&vcc->flags);
if (vcc->qos.aal != ATM_AAL5) return -EINVAL; /* @@@ AAL0 */ if (vcc->qos.aal != ATM_AAL5) return -EINVAL; /* @@@ AAL0 */
...@@ -1395,7 +1396,7 @@ static int zatm_open(struct atm_vcc *vcc) ...@@ -1395,7 +1396,7 @@ static int zatm_open(struct atm_vcc *vcc)
clear_bit(ATM_VF_ADDR,&vcc->flags); clear_bit(ATM_VF_ADDR,&vcc->flags);
return -ENOMEM; return -ENOMEM;
} }
ZATM_VCC(vcc) = zatm_vcc; vcc->dev_data = zatm_vcc;
ZATM_VCC(vcc)->tx_chan = 0; /* for zatm_close after open_rx */ ZATM_VCC(vcc)->tx_chan = 0; /* for zatm_close after open_rx */
if ((error = open_rx_first(vcc))) { if ((error = open_rx_first(vcc))) {
zatm_close(vcc); zatm_close(vcc);
...@@ -1597,7 +1598,7 @@ static int __init zatm_module_init(void) ...@@ -1597,7 +1598,7 @@ static int __init zatm_module_init(void)
dev = atm_dev_register(DEV_LABEL,&ops,-1,NULL); dev = atm_dev_register(DEV_LABEL,&ops,-1,NULL);
if (!dev) break; if (!dev) break;
zatm_dev->pci_dev = pci_dev; zatm_dev->pci_dev = pci_dev;
ZATM_DEV(dev) = zatm_dev; dev->dev_data = zatm_dev;
zatm_dev->copper = type; zatm_dev->copper = type;
if (zatm_init(dev) || zatm_start(dev)) { if (zatm_init(dev) || zatm_start(dev)) {
atm_dev_deregister(dev); atm_dev_deregister(dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment