diff options
Diffstat (limited to 'sound/firewire')
| -rw-r--r-- | sound/firewire/amdtp.h | 1 | ||||
| -rw-r--r-- | sound/firewire/scs1x.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sound/firewire/amdtp.h b/sound/firewire/amdtp.h index b680c5ef01d..f6103d68c4b 100644 --- a/sound/firewire/amdtp.h +++ b/sound/firewire/amdtp.h @@ -3,7 +3,6 @@ #include <linux/interrupt.h> #include <linux/mutex.h> -#include <linux/spinlock.h> #include "packets-buffer.h" /** diff --git a/sound/firewire/scs1x.c b/sound/firewire/scs1x.c index 844a555c3b1..b252c21b6d1 100644 --- a/sound/firewire/scs1x.c +++ b/sound/firewire/scs1x.c @@ -405,8 +405,10 @@ static int scs_probe(struct device *unit_dev) scs->output_idle = true; scs->buffer = kmalloc(HSS1394_MAX_PACKET_SIZE, GFP_KERNEL); - if (!scs->buffer) + if (!scs->buffer) { + err = -ENOMEM; goto err_card; + } scs->hss_handler.length = HSS1394_MAX_PACKET_SIZE; scs->hss_handler.address_callback = handle_hss; |