diff options
Diffstat (limited to 'drivers/staging/vme')
| -rw-r--r-- | drivers/staging/vme/devices/vme_user.c | 6 | ||||
| -rw-r--r-- | drivers/staging/vme/devices/vme_user.h | 12 |
2 files changed, 10 insertions, 8 deletions
diff --git a/drivers/staging/vme/devices/vme_user.c b/drivers/staging/vme/devices/vme_user.c index da7f759..daec155 100644 --- a/drivers/staging/vme/devices/vme_user.c +++ b/drivers/staging/vme/devices/vme_user.c @@ -109,7 +109,7 @@ struct driver_stats { unsigned long ioctls; unsigned long irqs; unsigned long berrs; - unsigned long dmaErrors; + unsigned long dmaerrors; unsigned long timeouts; unsigned long external; }; @@ -160,7 +160,7 @@ static void reset_counters(void) statistics.ioctls = 0; statistics.irqs = 0; statistics.berrs = 0; - statistics.dmaErrors = 0; + statistics.dmaerrors = 0; statistics.timeouts = 0; } @@ -734,6 +734,7 @@ static int vme_user_probe(struct vme_dev *vdev) if (image[i].resource == NULL) { dev_warn(&vdev->dev, "Unable to allocate slave resource\n"); + err = -ENOMEM; goto err_slave; } image[i].size_buf = PCI_BUF_SIZE; @@ -760,6 +761,7 @@ static int vme_user_probe(struct vme_dev *vdev) if (image[i].resource == NULL) { dev_warn(&vdev->dev, "Unable to allocate master resource\n"); + err = -ENOMEM; goto err_master; } image[i].size_buf = PCI_BUF_SIZE; diff --git a/drivers/staging/vme/devices/vme_user.h b/drivers/staging/vme/devices/vme_user.h index 7d24cd6..280ccc7 100644 --- a/drivers/staging/vme/devices/vme_user.h +++ b/drivers/staging/vme/devices/vme_user.h @@ -14,9 +14,9 @@ struct vme_master { u32 cycle; /* Cycle properties */ u32 dwidth; /* Maximum Data Width */ #if 0 - char prefetchEnable; /* Prefetch Read Enable State */ - int prefetchSize; /* Prefetch Read Size (Cache Lines) */ - char wrPostEnable; /* Write Post State */ + char prefetchenable; /* Prefetch Read Enable State */ + int prefetchsize; /* Prefetch Read Size (Cache Lines) */ + char wrpostenable; /* Write Post State */ #endif }; @@ -37,9 +37,9 @@ struct vme_slave { u32 aspace; /* Address Space */ u32 cycle; /* Cycle properties */ #if 0 - char wrPostEnable; /* Write Post State */ - char rmwLock; /* Lock PCI during RMW Cycles */ - char data64BitCapable; /* non-VMEbus capable of 64-bit Data */ + char wrpostenable; /* Write Post State */ + char rmwlock; /* Lock PCI during RMW Cycles */ + char data64bitcapable; /* non-VMEbus capable of 64-bit Data */ #endif }; |