diff options
Diffstat (limited to 'drivers/memstick')
-rw-r--r-- | drivers/memstick/host/jmb38x_ms.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/memstick/host/jmb38x_ms.c b/drivers/memstick/host/jmb38x_ms.c index a054668eda16..4e3bfbcdf155 100644 --- a/drivers/memstick/host/jmb38x_ms.c +++ b/drivers/memstick/host/jmb38x_ms.c | |||
@@ -51,7 +51,7 @@ struct jmb38x_ms_host { | |||
51 | void __iomem *addr; | 51 | void __iomem *addr; |
52 | spinlock_t lock; | 52 | spinlock_t lock; |
53 | int id; | 53 | int id; |
54 | char host_id[DEVICE_ID_SIZE]; | 54 | char host_id[32]; |
55 | int irq; | 55 | int irq; |
56 | unsigned int block_pos; | 56 | unsigned int block_pos; |
57 | unsigned long timeout_jiffies; | 57 | unsigned long timeout_jiffies; |
@@ -781,7 +781,7 @@ static struct memstick_host *jmb38x_ms_alloc_host(struct jmb38x_ms *jm, int cnt) | |||
781 | 781 | ||
782 | spin_lock_init(&host->lock); | 782 | spin_lock_init(&host->lock); |
783 | host->id = cnt; | 783 | host->id = cnt; |
784 | snprintf(host->host_id, DEVICE_ID_SIZE, DRIVER_NAME ":slot%d", | 784 | snprintf(host->host_id, sizeof(host->host_id), DRIVER_NAME ":slot%d", |
785 | host->id); | 785 | host->id); |
786 | host->irq = jm->pdev->irq; | 786 | host->irq = jm->pdev->irq; |
787 | host->timeout_jiffies = msecs_to_jiffies(1000); | 787 | host->timeout_jiffies = msecs_to_jiffies(1000); |