diff options
Diffstat (limited to 'drivers/usb/host')
-rw-r--r-- | drivers/usb/host/hc_crisv10.c | 2 | ||||
-rw-r--r-- | drivers/usb/host/ohci-pnx4008.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/host/hc_crisv10.c b/drivers/usb/host/hc_crisv10.c index 396dc69d4b4c..7fd872aa654a 100644 --- a/drivers/usb/host/hc_crisv10.c +++ b/drivers/usb/host/hc_crisv10.c | |||
@@ -188,7 +188,7 @@ static DEFINE_TIMER(bulk_eot_timer, NULL, 0, 0); | |||
188 | #define CHECK_ALIGN(x) if (((__u32)(x)) & 0x00000003) \ | 188 | #define CHECK_ALIGN(x) if (((__u32)(x)) & 0x00000003) \ |
189 | {panic("Alignment check (DWORD) failed at %s:%s:%d\n", __FILE__, __FUNCTION__, __LINE__);} | 189 | {panic("Alignment check (DWORD) failed at %s:%s:%d\n", __FILE__, __FUNCTION__, __LINE__);} |
190 | 190 | ||
191 | #define SLAB_FLAG (in_interrupt() ? GFP_ATOMIC : SLAB_KERNEL) | 191 | #define SLAB_FLAG (in_interrupt() ? GFP_ATOMIC : GFP_KERNEL) |
192 | #define KMALLOC_FLAG (in_interrupt() ? GFP_ATOMIC : GFP_KERNEL) | 192 | #define KMALLOC_FLAG (in_interrupt() ? GFP_ATOMIC : GFP_KERNEL) |
193 | 193 | ||
194 | /* Most helpful debugging aid */ | 194 | /* Most helpful debugging aid */ |
diff --git a/drivers/usb/host/ohci-pnx4008.c b/drivers/usb/host/ohci-pnx4008.c index 2dbb77414905..7f26f9bdbaf1 100644 --- a/drivers/usb/host/ohci-pnx4008.c +++ b/drivers/usb/host/ohci-pnx4008.c | |||
@@ -134,7 +134,7 @@ static int isp1301_attach(struct i2c_adapter *adap, int addr, int kind) | |||
134 | { | 134 | { |
135 | struct i2c_client *c; | 135 | struct i2c_client *c; |
136 | 136 | ||
137 | c = (struct i2c_client *)kzalloc(sizeof(*c), SLAB_KERNEL); | 137 | c = (struct i2c_client *)kzalloc(sizeof(*c), GFP_KERNEL); |
138 | 138 | ||
139 | if (!c) | 139 | if (!c) |
140 | return -ENOMEM; | 140 | return -ENOMEM; |